From b348e456a5ebc26a5a8b9f9290b03e331686c0b8 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Wed, 26 Sep 2018 10:41:59 +0200 Subject: [PATCH 1/2] Upgrade OpenSSL-Apple to raise iOS target to 11 --- CHANGELOG.md | 4 +++- Podfile | 6 +++--- Podfile.lock | 10 +++++----- TunnelKit.podspec | 2 +- TunnelKit.xcodeproj/project.pbxproj | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f87a851..6346d29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,9 +21,11 @@ and this project _will soonly adhere_ to [Semantic Versioning](https://semver.or ### Changed +- Raised iOS target to 11 (drops 32-bit support). +- Upgraded OpenSSL from 1.1.0h to 1.1.0i. +- Minor adjustments for Xcode 10 / Swift 4.2. - Deep refactoring of control channel for future extensibility. - App group moved out of tunnel configuration, to make it more platform-agnostic and coherent to serialize. -- Minor adjustments for Xcode 10 / Swift 4.2. - Several internal renamings. ### Fixed diff --git a/Podfile b/Podfile index 4f57486..5f460dc 100644 --- a/Podfile +++ b/Podfile @@ -3,13 +3,13 @@ use_frameworks! abstract_target 'TunnelKit' do pod 'SwiftyBeaver' - pod 'OpenSSL-Apple', '~> 1.1.0h' + pod 'OpenSSL-Apple', '~> 1.1.0i' target 'TunnelKit-iOS' do - platform :ios, '9.0' + platform :ios, '11.0' end target 'TunnelKitHost' do - platform :ios, '9.0' + platform :ios, '11.0' end target 'TunnelKit-macOS' do diff --git a/Podfile.lock b/Podfile.lock index 38af694..731515c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - OpenSSL-Apple (1.1.0h) + - OpenSSL-Apple (1.1.0i-v2) - SwiftyBeaver (1.6.1) DEPENDENCIES: - - OpenSSL-Apple (~> 1.1.0h) + - OpenSSL-Apple (~> 1.1.0i) - SwiftyBeaver SPEC REPOS: @@ -12,9 +12,9 @@ SPEC REPOS: - SwiftyBeaver SPEC CHECKSUMS: - OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208 + OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a -PODFILE CHECKSUM: db783bdfb06f72df39d3c99df20aafdb51e0f7c6 +PODFILE CHECKSUM: 7cd71c5bc177daedf9933b9428b39c0c9ffae5a6 -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.0.beta.1 diff --git a/TunnelKit.podspec b/TunnelKit.podspec index c9f6a0d..1f7d695 100644 --- a/TunnelKit.podspec +++ b/TunnelKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.author = { "Davide De Rosa" => "keeshux@gmail.com" } s.source = { :git => "https://github.com/keeshux/tunnelkit.git", :tag => "v#{s.version}" } - s.ios.deployment_target = "9.0" + s.ios.deployment_target = "11.0" s.osx.deployment_target = "10.11" s.subspec "Core" do |p| diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index ce36f05..3b42990 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -809,7 +809,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", ); @@ -820,7 +820,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ From b0ff73df595c50d55a0a7cbda3fce90732a2f7a3 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 24 Sep 2018 11:17:33 +0200 Subject: [PATCH 2/2] Add Gemfile to lock CocoaPods Skip 1.5, has a few issues. --- Gemfile | 3 ++ Gemfile.lock | 76 +++++++++++++++++++++++++++++ Podfile.lock | 7 +-- README.md | 2 +- TunnelKit.xcodeproj/project.pbxproj | 64 +++++++++++++++++++++++- 5 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..97d1964 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "cocoapods", "1.4" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..c105b78 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,76 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.0) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + atomos (0.1.3) + claide (1.0.2) + cocoapods (1.4.0) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.4.0) + cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.6.4) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.4, < 2.0) + cocoapods-core (1.4.0) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.2) + cocoapods-downloader (1.2.1) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + molinillo (0.6.6) + nanaimo (0.2.6) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.2.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + xcodeproj (1.6.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (= 1.4) + +BUNDLED WITH + 1.16.5 diff --git a/Podfile.lock b/Podfile.lock index 731515c..71b1c03 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -6,15 +6,10 @@ DEPENDENCIES: - OpenSSL-Apple (~> 1.1.0i) - SwiftyBeaver -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - OpenSSL-Apple - - SwiftyBeaver - SPEC CHECKSUMS: OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a PODFILE CHECKSUM: 7cd71c5bc177daedf9933b9428b39c0c9ffae5a6 -COCOAPODS: 1.6.0.beta.1 +COCOAPODS: 1.4.0 diff --git a/README.md b/README.md index f914cd6..73dba43 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ The library therefore supports compression framing, just not compression. Rememb - Xcode 9+ (Swift 4) - Git (preinstalled with Xcode Command Line Tools) - Ruby (preinstalled with macOS) -- [CocoaPods 1.5.0][dep-cocoapods] +- [CocoaPods 1.4.0][dep-cocoapods] - [jazzy][dep-jazzy] (optional, for documentation) It's highly recommended to use the Git and Ruby packages provided by [Homebrew][dep-brew]. diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index 3b42990..591b1f5 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -604,6 +604,7 @@ 0E1108A61F77B9F900A92462 /* Frameworks */, 0E1108A71F77B9F900A92462 /* Resources */, B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */, + CB8BC028A305D776BF99051F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -624,6 +625,7 @@ 0E17D7F51F730D9F009EE129 /* Frameworks */, 0E17D7F61F730D9F009EE129 /* Headers */, 0E17D7F71F730D9F009EE129 /* Resources */, + D908F7F68DFAC49339D3642D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -643,6 +645,7 @@ 0E3251C11F95770D00C108D9 /* Frameworks */, 0E3251C21F95770D00C108D9 /* Headers */, 0E3251C31F95770D00C108D9 /* Resources */, + 4D0B460E051C7982B3C6766D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -767,6 +770,25 @@ 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; }; + 4D0B460E051C7982B3C6766D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -809,7 +831,7 @@ files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", ); @@ -820,7 +842,45 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + CB8BC028A305D776BF99051F /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + D908F7F68DFAC49339D3642D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */