diff --git a/Configuration/Info-Framework.plist b/Configuration/Info-Framework.plist index 20b05ec..db8ba7b 100644 --- a/Configuration/Info-Framework.plist +++ b/Configuration/Info-Framework.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + 0.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Configuration/Project.xcconfig b/Configuration/Project.xcconfig index 2e71b19..1d1e4bd 100755 --- a/Configuration/Project.xcconfig +++ b/Configuration/Project.xcconfig @@ -1,6 +1,8 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx TARGETED_DEVICE_FAMILY = 1,2 +ENABLE_BITCODE = NO + //////////////////////////////////////////////////////////////////////////////// // // iOS-specific settings @@ -13,9 +15,6 @@ VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64 LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = @executable_path/Frameworks @loader_path/Frameworks LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = @executable_path/Frameworks @loader_path/Frameworks -ENABLE_BITCODE[sdk=iphonesimulator*] = NO -ENABLE_BITCODE[sdk=iphone*] = NO - //////////////////////////////////////////////////////////////////////////////// // // macOS-specific settings @@ -25,5 +24,3 @@ MACOSX_DEPLOYMENT_TARGET = 10.11 VALID_ARCHS[sdk=macosx*] = i386 x86_64 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = @executable_path/../Frameworks @loader_path/../Frameworks - -ENABLE_BITCODE[sdk=macosx*] = NO diff --git a/Configuration/Tests.xcconfig b/Configuration/Tests.xcconfig index aa7d1a6..56fd515 100755 --- a/Configuration/Tests.xcconfig +++ b/Configuration/Tests.xcconfig @@ -1,5 +1,4 @@ INFOPLIST_FILE = Configuration/Info-Tests.plist -PRODUCT_NAME = OpenVPNAdapterTests PRODUCT_BUNDLE_IDENTIFIER = me.ss-abramchuk.openvpn-adapter.test SWIFT_OPTIMIZATION_LEVEL = -Onone ONLY_ACTIVE_ARCH = YES diff --git a/OpenVPN Adapter.xcodeproj/project.pbxproj b/OpenVPN Adapter.xcodeproj/project.pbxproj index c8f6264..b755ef8 100644 --- a/OpenVPN Adapter.xcodeproj/project.pbxproj +++ b/OpenVPN Adapter.xcodeproj/project.pbxproj @@ -24,17 +24,43 @@ C9BB47931E71821A00F3F98C /* OpenVPNAdapter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9BB475C1E71663A00F3F98C /* OpenVPNAdapter.framework */; }; C9BB479C1E71836100F3F98C /* free_openvpn_udp.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = C9BB479B1E71836100F3F98C /* free_openvpn_udp.ovpn */; }; C9BB47A21E7183DB00F3F98C /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47A11E7183DB00F3F98C /* Bundle.swift */; }; + C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB477E1E7173C700F3F98C /* OpenVPNAdapter.mm */; }; + C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47781E7171ED00F3F98C /* OpenVPNClient.mm */; }; + C9D2ABDD1EA20F99007EDF9D /* TUNConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47741E7171D900F3F98C /* TUNConfiguration.m */; }; + C9D2ABDE1EA20F99007EDF9D /* ovpncli.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9FD92191E9A667600374FC4 /* ovpncli.cpp */; }; + C9D2ABE01EA20F99007EDF9D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C912BB241E7C3339002B9414 /* NetworkExtension.framework */; }; + C9D2ABE11EA20F99007EDF9D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C90BAD301E73FF6C00DEFB32 /* SystemConfiguration.framework */; }; + C9D2ABE31EA20F99007EDF9D /* OpenVPNClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB47771E7171ED00F3F98C /* OpenVPNClient.h */; }; + C9D2ABE41EA20F99007EDF9D /* OpenVPNEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB47701E7171A100F3F98C /* OpenVPNEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9D2ABE51EA20F99007EDF9D /* OpenVPNAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB477B1E7173C700F3F98C /* OpenVPNAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9D2ABE61EA20F99007EDF9D /* Umbrella-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB475E1E71663A00F3F98C /* Umbrella-Header.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9D2ABE71EA20F99007EDF9D /* OpenVPNAdapter+Public.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB477D1E7173C700F3F98C /* OpenVPNAdapter+Public.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9D2ABE81EA20F99007EDF9D /* OpenVPNError.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB476F1E7171A100F3F98C /* OpenVPNError.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9D2ABE91EA20F99007EDF9D /* OpenVPNAdapter+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB477C1E7173C700F3F98C /* OpenVPNAdapter+Internal.h */; }; + C9D2ABEA1EA20F99007EDF9D /* ovpncli.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C9FD92181E9A667600374FC4 /* ovpncli.hpp */; }; + C9D2ABEB1EA20F99007EDF9D /* TUNConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB47731E7171D900F3F98C /* TUNConfiguration.h */; }; + C9D2ABF61EA212A3007EDF9D /* OpenVPNAdapterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47901E71821A00F3F98C /* OpenVPNAdapterTests.swift */; }; + C9D2ABF71EA212A3007EDF9D /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47A11E7183DB00F3F98C /* Bundle.swift */; }; + C9D2ABFB1EA212A3007EDF9D /* free_openvpn_udp.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = C9BB479B1E71836100F3F98C /* free_openvpn_udp.ovpn */; }; + C9D2AC051EA214EA007EDF9D /* OpenVPNAdapter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */; }; C9FD921A1E9A667600374FC4 /* ovpncli.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C9FD92181E9A667600374FC4 /* ovpncli.hpp */; }; C9FD921B1E9A667600374FC4 /* ovpncli.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9FD92191E9A667600374FC4 /* ovpncli.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - C9BB47941E71821A00F3F98C /* PBXContainerItemProxy */ = { + C9D2AC011EA214D3007EDF9D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C91030F81E471D760004DFFE /* Project object */; proxyType = 1; remoteGlobalIDString = C9BB475B1E71663A00F3F98C; - remoteInfo = "OpenVPN Adapter"; + remoteInfo = "OpenVPN Adapter iOS"; + }; + C9D2AC031EA214DF007EDF9D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C91030F81E471D760004DFFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = C9D2ABD81EA20F99007EDF9D; + remoteInfo = "OpenVPN Adapter macOS"; }; /* End PBXContainerItemProxy section */ @@ -60,10 +86,12 @@ C9BB477C1E7173C700F3F98C /* OpenVPNAdapter+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNAdapter+Internal.h"; sourceTree = ""; }; C9BB477D1E7173C700F3F98C /* OpenVPNAdapter+Public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNAdapter+Public.h"; sourceTree = ""; }; C9BB477E1E7173C700F3F98C /* OpenVPNAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = OpenVPNAdapter.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - C9BB478E1E71821A00F3F98C /* OpenVPN Adapter Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenVPN Adapter Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + C9BB478E1E71821A00F3F98C /* OpenVPN Adapter iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenVPN Adapter iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; C9BB47901E71821A00F3F98C /* OpenVPNAdapterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenVPNAdapterTests.swift; sourceTree = ""; }; C9BB479B1E71836100F3F98C /* free_openvpn_udp.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = free_openvpn_udp.ovpn; sourceTree = ""; }; C9BB47A11E7183DB00F3F98C /* Bundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = ""; }; + C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenVPNAdapter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C9D2ABFF1EA212A3007EDF9D /* OpenVPN Adapter macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenVPN Adapter macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; C9FD92181E9A667600374FC4 /* ovpncli.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ovpncli.hpp; path = Vendors/openvpn/client/ovpncli.hpp; sourceTree = ""; }; C9FD92191E9A667600374FC4 /* ovpncli.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ovpncli.cpp; path = Vendors/openvpn/client/ovpncli.cpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -86,6 +114,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C9D2ABDF1EA20F99007EDF9D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2ABE01EA20F99007EDF9D /* NetworkExtension.framework in Frameworks */, + C9D2ABE11EA20F99007EDF9D /* SystemConfiguration.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C9D2ABF81EA212A3007EDF9D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2AC051EA214EA007EDF9D /* OpenVPNAdapter.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -118,7 +163,9 @@ isa = PBXGroup; children = ( C9BB475C1E71663A00F3F98C /* OpenVPNAdapter.framework */, - C9BB478E1E71821A00F3F98C /* OpenVPN Adapter Tests.xctest */, + C9BB478E1E71821A00F3F98C /* OpenVPN Adapter iOS Tests.xctest */, + C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */, + C9D2ABFF1EA212A3007EDF9D /* OpenVPN Adapter macOS Tests.xctest */, ); name = Products; sourceTree = ""; @@ -261,12 +308,28 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C9D2ABE21EA20F99007EDF9D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2ABE31EA20F99007EDF9D /* OpenVPNClient.h in Headers */, + C9D2ABE41EA20F99007EDF9D /* OpenVPNEvent.h in Headers */, + C9D2ABE51EA20F99007EDF9D /* OpenVPNAdapter.h in Headers */, + C9D2ABE61EA20F99007EDF9D /* Umbrella-Header.h in Headers */, + C9D2ABE71EA20F99007EDF9D /* OpenVPNAdapter+Public.h in Headers */, + C9D2ABE81EA20F99007EDF9D /* OpenVPNError.h in Headers */, + C9D2ABE91EA20F99007EDF9D /* OpenVPNAdapter+Internal.h in Headers */, + C9D2ABEA1EA20F99007EDF9D /* ovpncli.hpp in Headers */, + C9D2ABEB1EA20F99007EDF9D /* TUNConfiguration.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - C9BB475B1E71663A00F3F98C /* OpenVPN Adapter */ = { + C9BB475B1E71663A00F3F98C /* OpenVPN Adapter iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C9BB47631E71663A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter" */; + buildConfigurationList = C9BB47631E71663A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter iOS" */; buildPhases = ( C9BB476E1E716E7000F3F98C /* Check Warning And Error Tags */, C9BB47571E71663A00F3F98C /* Sources */, @@ -278,14 +341,14 @@ ); dependencies = ( ); - name = "OpenVPN Adapter"; + name = "OpenVPN Adapter iOS"; productName = OpenVPNAdapter; productReference = C9BB475C1E71663A00F3F98C /* OpenVPNAdapter.framework */; productType = "com.apple.product-type.framework"; }; - C9BB478D1E71821A00F3F98C /* OpenVPN Adapter Tests */ = { + C9BB478D1E71821A00F3F98C /* OpenVPN Adapter iOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = C9BB47961E71821A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter Tests" */; + buildConfigurationList = C9BB47961E71821A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter iOS Tests" */; buildPhases = ( C9BB478A1E71821A00F3F98C /* Sources */, C9BB478B1E71821A00F3F98C /* Frameworks */, @@ -294,11 +357,48 @@ buildRules = ( ); dependencies = ( - C9BB47951E71821A00F3F98C /* PBXTargetDependency */, + C9D2AC021EA214D3007EDF9D /* PBXTargetDependency */, ); - name = "OpenVPN Adapter Tests"; + name = "OpenVPN Adapter iOS Tests"; productName = "OpenVPN Adapter Tests"; - productReference = C9BB478E1E71821A00F3F98C /* OpenVPN Adapter Tests.xctest */; + productReference = C9BB478E1E71821A00F3F98C /* OpenVPN Adapter iOS Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + C9D2ABD81EA20F99007EDF9D /* OpenVPN Adapter macOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = C9D2ABED1EA20F99007EDF9D /* Build configuration list for PBXNativeTarget "OpenVPN Adapter macOS" */; + buildPhases = ( + C9D2ABD91EA20F99007EDF9D /* Check Warning And Error Tags */, + C9D2ABDA1EA20F99007EDF9D /* Sources */, + C9D2ABDF1EA20F99007EDF9D /* Frameworks */, + C9D2ABE21EA20F99007EDF9D /* Headers */, + C9D2ABEC1EA20F99007EDF9D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "OpenVPN Adapter macOS"; + productName = OpenVPNAdapter; + productReference = C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */; + productType = "com.apple.product-type.framework"; + }; + C9D2ABF21EA212A3007EDF9D /* OpenVPN Adapter macOS Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = C9D2ABFC1EA212A3007EDF9D /* Build configuration list for PBXNativeTarget "OpenVPN Adapter macOS Tests" */; + buildPhases = ( + C9D2ABF51EA212A3007EDF9D /* Sources */, + C9D2ABF81EA212A3007EDF9D /* Frameworks */, + C9D2ABFA1EA212A3007EDF9D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + C9D2AC041EA214DF007EDF9D /* PBXTargetDependency */, + ); + name = "OpenVPN Adapter macOS Tests"; + productName = "OpenVPN Adapter Tests"; + productReference = C9D2ABFF1EA212A3007EDF9D /* OpenVPN Adapter macOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -319,6 +419,12 @@ DevelopmentTeam = 2TWXCGG7R3; ProvisioningStyle = Manual; }; + C9D2ABD81EA20F99007EDF9D = { + ProvisioningStyle = Manual; + }; + C9D2ABF21EA212A3007EDF9D = { + DevelopmentTeam = 2TWXCGG7R3; + }; }; }; buildConfigurationList = C91030FB1E471D760004DFFE /* Build configuration list for PBXProject "OpenVPN Adapter" */; @@ -334,8 +440,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - C9BB475B1E71663A00F3F98C /* OpenVPN Adapter */, - C9BB478D1E71821A00F3F98C /* OpenVPN Adapter Tests */, + C9BB475B1E71663A00F3F98C /* OpenVPN Adapter iOS */, + C9D2ABD81EA20F99007EDF9D /* OpenVPN Adapter macOS */, + C9BB478D1E71821A00F3F98C /* OpenVPN Adapter iOS Tests */, + C9D2ABF21EA212A3007EDF9D /* OpenVPN Adapter macOS Tests */, ); }; /* End PBXProject section */ @@ -356,6 +464,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C9D2ABEC1EA20F99007EDF9D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C9D2ABFA1EA212A3007EDF9D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2ABFB1EA212A3007EDF9D /* free_openvpn_udp.ovpn in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -371,7 +494,21 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/${TARGET_NAME}\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\""; + shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/OpenVPN Adapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\""; + }; + C9D2ABD91EA20F99007EDF9D /* Check Warning And Error Tags */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Warning And Error Tags"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/OpenVPN Adapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\""; }; /* End PBXShellScriptBuildPhase section */ @@ -396,13 +533,38 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C9D2ABDA1EA20F99007EDF9D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */, + C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */, + C9D2ABDD1EA20F99007EDF9D /* TUNConfiguration.m in Sources */, + C9D2ABDE1EA20F99007EDF9D /* ovpncli.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C9D2ABF51EA212A3007EDF9D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C9D2ABF61EA212A3007EDF9D /* OpenVPNAdapterTests.swift in Sources */, + C9D2ABF71EA212A3007EDF9D /* Bundle.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C9BB47951E71821A00F3F98C /* PBXTargetDependency */ = { + C9D2AC021EA214D3007EDF9D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C9BB475B1E71663A00F3F98C /* OpenVPN Adapter */; - targetProxy = C9BB47941E71821A00F3F98C /* PBXContainerItemProxy */; + target = C9BB475B1E71663A00F3F98C /* OpenVPN Adapter iOS */; + targetProxy = C9D2AC011EA214D3007EDF9D /* PBXContainerItemProxy */; + }; + C9D2AC041EA214DF007EDF9D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C9D2ABD81EA20F99007EDF9D /* OpenVPN Adapter macOS */; + targetProxy = C9D2AC031EA214DF007EDF9D /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -430,6 +592,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; }; name = Debug; @@ -456,6 +619,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; @@ -486,7 +650,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_DYNAMIC_NO_PIC = NO; @@ -500,11 +663,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -537,7 +701,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -550,10 +713,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -604,7 +768,9 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; @@ -650,7 +816,217 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + C9D2ABEE1EA20F99007EDF9D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C90BAD2B1E73F69500DEFB32 /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Mac Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + C9D2ABEF1EA20F99007EDF9D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C90BAD2C1E73F69500DEFB32 /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + C9D2ABFD1EA212A3007EDF9D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C90BAD2F1E73FA7400DEFB32 /* Tests.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = 2TWXCGG7R3; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + C9D2ABFE1EA212A3007EDF9D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C90BAD2F1E73FA7400DEFB32 /* Tests.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 2TWXCGG7R3; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; VALIDATE_PRODUCT = YES; @@ -669,7 +1045,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C9BB47631E71663A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter" */ = { + C9BB47631E71663A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C9BB47611E71663A00F3F98C /* Debug */, @@ -678,7 +1054,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C9BB47961E71821A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter Tests" */ = { + C9BB47961E71821A00F3F98C /* Build configuration list for PBXNativeTarget "OpenVPN Adapter iOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( C9BB47971E71821A00F3F98C /* Debug */, @@ -687,6 +1063,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + C9D2ABED1EA20F99007EDF9D /* Build configuration list for PBXNativeTarget "OpenVPN Adapter macOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C9D2ABEE1EA20F99007EDF9D /* Debug */, + C9D2ABEF1EA20F99007EDF9D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C9D2ABFC1EA212A3007EDF9D /* Build configuration list for PBXNativeTarget "OpenVPN Adapter macOS Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C9D2ABFD1EA212A3007EDF9D /* Debug */, + C9D2ABFE1EA212A3007EDF9D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = C91030F81E471D760004DFFE /* Project object */; diff --git a/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter.xcscheme b/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter iOS.xcscheme similarity index 94% rename from OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter.xcscheme rename to OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter iOS.xcscheme index 176d6a5..42a85a6 100644 --- a/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter.xcscheme +++ b/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C9BB475B1E71663A00F3F98C" BuildableName = "OpenVPNAdapter.framework" - BlueprintName = "OpenVPN Adapter" + BlueprintName = "OpenVPN Adapter iOS" ReferencedContainer = "container:OpenVPN Adapter.xcodeproj"> @@ -47,7 +47,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C9BB475B1E71663A00F3F98C" BuildableName = "OpenVPNAdapter.framework" - BlueprintName = "OpenVPN Adapter" + BlueprintName = "OpenVPN Adapter iOS" ReferencedContainer = "container:OpenVPN Adapter.xcodeproj"> @@ -65,7 +65,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C9BB475B1E71663A00F3F98C" BuildableName = "OpenVPNAdapter.framework" - BlueprintName = "OpenVPN Adapter" + BlueprintName = "OpenVPN Adapter iOS" ReferencedContainer = "container:OpenVPN Adapter.xcodeproj"> diff --git a/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter macOS.xcscheme b/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter macOS.xcscheme new file mode 100644 index 0000000..a27b6c3 --- /dev/null +++ b/OpenVPN Adapter.xcodeproj/xcshareddata/xcschemes/OpenVPN Adapter macOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +