diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-05-14 20:24:56 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-05-17 19:29:22 +0200 |
| commit | cb7848ce01e03f35348bd337af282d2b37171b3b (patch) | |
| tree | 837eb6f1cb6d3b8070124de7a1404bb91955f06b | |
| parent | fc7f384bf0c145b531a32b3a01682027b286e55a (diff) | |
| download | mullvadvpn-cb7848ce01e03f35348bd337af282d2b37171b3b.tar.xz mullvadvpn-cb7848ce01e03f35348bd337af282d2b37171b3b.zip | |
Add CocoaPods and ProcedureKit
| -rw-r--r-- | ios/.gitignore | 3 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 108 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcworkspace/contents.xcworkspacedata | 10 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 8 | ||||
| -rw-r--r-- | ios/Podfile | 16 | ||||
| -rw-r--r-- | ios/Podfile.lock | 21 |
6 files changed, 166 insertions, 0 deletions
diff --git a/ios/.gitignore b/ios/.gitignore index bc91965ae3..7c18207d40 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -32,6 +32,9 @@ xcuserdata/ timeline.xctimeline playground.xcworkspace +# CocoaPods +Pods/ + # Swift Package Manager # # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index dfad4e7f75..b629bc642d 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 08A905C56DDB0A0A887BB5F5 /* Pods_MullvadVPN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F506AB938C45AEB812886B4 /* Pods_MullvadVPN.framework */; }; + 543203592C79FAD36BC1E700 /* Pods_PacketTunnel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A931E0F6F380B4B3FD45D987 /* Pods_PacketTunnel.framework */; }; 5862805422428EF100F5A6E1 /* TranslucentButtonBlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5862805322428EF100F5A6E1 /* TranslucentButtonBlurView.swift */; }; 5867A51C2248F26A005513C0 /* SegueIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5867A51B2248F26A005513C0 /* SegueIdentifier.swift */; }; 587CBFE322807F530028DED3 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587CBFE222807F530028DED3 /* UIColor+Helpers.swift */; }; @@ -60,6 +62,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 3F506AB938C45AEB812886B4 /* Pods_MullvadVPN.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MullvadVPN.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 40D54D8A8B75B67DC37C5CCE /* Pods-PacketTunnel.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PacketTunnel.release.xcconfig"; path = "Target Support Files/Pods-PacketTunnel/Pods-PacketTunnel.release.xcconfig"; sourceTree = "<group>"; }; 5862805322428EF100F5A6E1 /* TranslucentButtonBlurView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslucentButtonBlurView.swift; sourceTree = "<group>"; }; 5866F39B2243B82D00168AE5 /* MullvadVPN.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MullvadVPN.entitlements; sourceTree = "<group>"; }; 5867A51B2248F26A005513C0 /* SegueIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegueIdentifier.swift; sourceTree = "<group>"; }; @@ -91,6 +95,10 @@ 58CE5E7D224146470008646E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 58CE5E7E224146470008646E /* PacketTunnel.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PacketTunnel.entitlements; sourceTree = "<group>"; }; 58F37E7C2243ECCB00C75C97 /* HeaderBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderBarViewController.swift; sourceTree = "<group>"; }; + 627D4CE562B85202FCFA0EB1 /* Pods-MullvadVPN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MullvadVPN.debug.xcconfig"; path = "Target Support Files/Pods-MullvadVPN/Pods-MullvadVPN.debug.xcconfig"; sourceTree = "<group>"; }; + 9F1362F46063B1D06EB0C685 /* Pods-PacketTunnel.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PacketTunnel.debug.xcconfig"; path = "Target Support Files/Pods-PacketTunnel/Pods-PacketTunnel.debug.xcconfig"; sourceTree = "<group>"; }; + A931E0F6F380B4B3FD45D987 /* Pods_PacketTunnel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PacketTunnel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DBBD45CCF670C9D1C5C1AD03 /* Pods-MullvadVPN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MullvadVPN.release.xcconfig"; path = "Target Support Files/Pods-MullvadVPN/Pods-MullvadVPN.release.xcconfig"; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -98,6 +106,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 08A905C56DDB0A0A887BB5F5 /* Pods_MullvadVPN.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,18 +114,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 543203592C79FAD36BC1E700 /* Pods_PacketTunnel.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0E15C74FDCF763609B367486 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F506AB938C45AEB812886B4 /* Pods_MullvadVPN.framework */, + A931E0F6F380B4B3FD45D987 /* Pods_PacketTunnel.framework */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; 58CE5E57224146200008646E = { isa = PBXGroup; children = ( 58CE5E62224146200008646E /* MullvadVPN */, 58CE5E7A224146470008646E /* PacketTunnel */, 58CE5E61224146200008646E /* Products */, + EA56DDD29D7312EAC382022A /* Pods */, + 0E15C74FDCF763609B367486 /* Frameworks */, ); sourceTree = "<group>"; }; @@ -172,6 +193,17 @@ path = PacketTunnel; sourceTree = "<group>"; }; + EA56DDD29D7312EAC382022A /* Pods */ = { + isa = PBXGroup; + children = ( + 627D4CE562B85202FCFA0EB1 /* Pods-MullvadVPN.debug.xcconfig */, + DBBD45CCF670C9D1C5C1AD03 /* Pods-MullvadVPN.release.xcconfig */, + 9F1362F46063B1D06EB0C685 /* Pods-PacketTunnel.debug.xcconfig */, + 40D54D8A8B75B67DC37C5CCE /* Pods-PacketTunnel.release.xcconfig */, + ); + path = Pods; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -179,10 +211,12 @@ isa = PBXNativeTarget; buildConfigurationList = 58CE5E72224146210008646E /* Build configuration list for PBXNativeTarget "MullvadVPN" */; buildPhases = ( + A4E72CCF49FD4D29D984E1FC /* [CP] Check Pods Manifest.lock */, 58CE5E5C224146200008646E /* Sources */, 58CE5E5D224146200008646E /* Frameworks */, 58CE5E5E224146200008646E /* Resources */, 58CE5E85224146470008646E /* Embed App Extensions */, + 423609432954668DE7DEA7D5 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -198,6 +232,7 @@ isa = PBXNativeTarget; buildConfigurationList = 58CE5E82224146470008646E /* Build configuration list for PBXNativeTarget "PacketTunnel" */; buildPhases = ( + C8E26D766ABD05BF7B4EB4AC /* [CP] Check Pods Manifest.lock */, 58CE5E75224146470008646E /* Sources */, 58CE5E76224146470008646E /* Frameworks */, 58CE5E77224146470008646E /* Resources */, @@ -275,6 +310,75 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 423609432954668DE7DEA7D5 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MullvadVPN/Pods-MullvadVPN-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/ProcedureKit/ProcedureKit.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ProcedureKit.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MullvadVPN/Pods-MullvadVPN-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + A4E72CCF49FD4D29D984E1FC /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MullvadVPN-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C8E26D766ABD05BF7B4EB4AC /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PacketTunnel-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 58CE5E5C224146200008646E /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -460,6 +564,7 @@ }; 58CE5E73224146210008646E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 627D4CE562B85202FCFA0EB1 /* Pods-MullvadVPN.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -482,6 +587,7 @@ }; 58CE5E74224146210008646E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = DBBD45CCF670C9D1C5C1AD03 /* Pods-MullvadVPN.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -504,6 +610,7 @@ }; 58CE5E83224146470008646E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 9F1362F46063B1D06EB0C685 /* Pods-PacketTunnel.debug.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; @@ -524,6 +631,7 @@ }; 58CE5E84224146470008646E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 40D54D8A8B75B67DC37C5CCE /* Pods-PacketTunnel.release.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; diff --git a/ios/MullvadVPN.xcworkspace/contents.xcworkspacedata b/ios/MullvadVPN.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..f80b10ec01 --- /dev/null +++ b/ios/MullvadVPN.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "group:MullvadVPN.xcodeproj"> + </FileRef> + <FileRef + location = "group:Pods/Pods.xcodeproj"> + </FileRef> +</Workspace> diff --git a/ios/MullvadVPN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/MullvadVPN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/ios/MullvadVPN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IDEDidComputeMac32BitWarning</key> + <true/> +</dict> +</plist> diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000000..303e8f44cf --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,16 @@ +# Uncomment the next line to define a global platform for your project +platform :ios, '12.0' + +# Disable sending stats +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +target 'MullvadVPN' do + use_frameworks! + + pod 'ProcedureKit', '5.2.0' + pod 'ProcedureKit/Network', '5.2.0' +end + +target 'PacketTunnel' do + use_frameworks! +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 0000000000..b8e066c146 --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,21 @@ +PODS: + - ProcedureKit (5.2.0): + - ProcedureKit/Standard (= 5.2.0) + - ProcedureKit/Network (5.2.0): + - ProcedureKit/Standard + - ProcedureKit/Standard (5.2.0) + +DEPENDENCIES: + - ProcedureKit (= 5.2.0) + - ProcedureKit/Network (= 5.2.0) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - ProcedureKit + +SPEC CHECKSUMS: + ProcedureKit: deafeab083a0c5e45e4b02379e0ffa316d03db29 + +PODFILE CHECKSUM: 60eba65d4e5de6e969c10d6886293366a3f97e23 + +COCOAPODS: 1.6.1 |
