From b348e456a5ebc26a5a8b9f9290b03e331686c0b8 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Wed, 26 Sep 2018 10:41:59 +0200 Subject: [PATCH] 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 */