From 0e891a102990ccb3e15f03c1e0e7dbaddc0b8081 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 23 Feb 2019 22:31:15 +0100 Subject: [PATCH] Fix OpenSSL version in pod and podspec And bump spec to 1.4.1 --- CHANGELOG.md | 1 + Podfile | 2 +- Podfile.lock | 14 +++++++------- TunnelKit.podspec | 4 ++-- TunnelKit.xcodeproj/project.pbxproj | 14 +++----------- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57d5488..61187dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Compiling errors in demo target. +- Linking errors with OpenSSL. ## 1.4.0 (2018-11-12) diff --git a/Podfile b/Podfile index 12d747e..416d338 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! abstract_target 'TunnelKit' do pod 'SwiftyBeaver' - pod 'OpenSSL-Apple', '~> 1.1.0i' + pod 'OpenSSL-Apple', '~> 1.1.0i.2' target 'TunnelKit-iOS' do platform :ios, '11.0' diff --git a/Podfile.lock b/Podfile.lock index 8379905..aec9fd8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - OpenSSL-Apple (1.1.0i-v2) - - SwiftyBeaver (1.6.1) + - OpenSSL-Apple (1.1.0i.2) + - SwiftyBeaver (1.6.2) DEPENDENCIES: - - OpenSSL-Apple (~> 1.1.0i) + - OpenSSL-Apple (~> 1.1.0i.2) - SwiftyBeaver SPEC REPOS: @@ -12,9 +12,9 @@ SPEC REPOS: - SwiftyBeaver SPEC CHECKSUMS: - OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c - SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a + OpenSSL-Apple: 37a8c0b04df4bb8971deef4671cc29222861319c + SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e -PODFILE CHECKSUM: a2a8378a7c5994df97e482430ba3f6983a54efea +PODFILE CHECKSUM: b66d2624e26ea150d992a8457747267128054176 -COCOAPODS: 1.6.0.beta.2 +COCOAPODS: 1.7.0.beta.1 diff --git a/TunnelKit.podspec b/TunnelKit.podspec index 4c21fc9..afe9349 100644 --- a/TunnelKit.podspec +++ b/TunnelKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "TunnelKit" - s.version = "1.4.0" + s.version = "1.4.1" s.summary = "Non-official OpenVPN client for Apple platforms." s.homepage = "https://github.com/keeshux/tunnelkit" @@ -19,7 +19,7 @@ Pod::Spec.new do |s| p.pod_target_xcconfig = { "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/Core", "APPLICATION_EXTENSION_API_ONLY" => "YES" } p.dependency "SwiftyBeaver" - p.dependency "OpenSSL-Apple", "~> 1.1.0h" + p.dependency "OpenSSL-Apple", "~> 1.1.0i.2" end s.subspec "AppExtension" do |p| diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index a5f3f48..3e899ef 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -11,12 +11,12 @@ 0E011F7B2196D93600BA59EE /* SocketType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F792196D93600BA59EE /* SocketType.swift */; }; 0E011F7D2196D97200BA59EE /* EndpointProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */; }; 0E011F7E2196D97200BA59EE /* EndpointProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */; }; - 0E011F882196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; }; - 0E011F892196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; }; 0E011F812196E23700BA59EE /* ConfigurationParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */; }; 0E011F822196E23800BA59EE /* ConfigurationParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */; }; 0E011F852196E25900BA59EE /* pia-hungary.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E011F832196E25400BA59EE /* pia-hungary.ovpn */; }; 0E011F862196E25A00BA59EE /* pia-hungary.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E011F832196E25400BA59EE /* pia-hungary.ovpn */; }; + 0E011F882196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; }; + 0E011F892196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; }; 0E041D092152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */; }; 0E041D0A2152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */; }; 0E041D0C2152E80A0025FE3C /* StaticKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */; }; @@ -235,9 +235,9 @@ /* Begin PBXFileReference section */ 0E011F792196D93600BA59EE /* SocketType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketType.swift; sourceTree = ""; }; 0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndpointProtocol.swift; sourceTree = ""; }; - 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationParser.swift; sourceTree = ""; }; 0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationParserTests.swift; sourceTree = ""; }; 0E011F832196E25400BA59EE /* pia-hungary.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pia-hungary.ovpn"; sourceTree = ""; }; + 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationParser.swift; sourceTree = ""; }; 0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+TLSWrap.swift"; sourceTree = ""; }; 0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticKeyTests.swift; sourceTree = ""; }; 0E07595C20EF6D1400F38FD8 /* CryptoCBC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CryptoCBC.m; sourceTree = ""; }; @@ -907,16 +907,12 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( "${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", ); name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework", @@ -1019,16 +1015,12 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitTests-macOS/Pods-TunnelKit-TunnelKitTests-macOS-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/MacOSX/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework", ); name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",