From 75830dc5e6b6c27b65d8c661dc587b9e7d3f4976 Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Sun, 8 Jan 2017 12:51:25 +0200 Subject: [PATCH 1/5] update podfile and podspec to support cocoapod 1.0 --- MIHCrypto.podspec | 11 +++++++---- Podfile | 9 +++++++-- Podfile.lock | 6 ++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/MIHCrypto.podspec b/MIHCrypto.podspec index 9a1b00b..0f13108 100644 --- a/MIHCrypto.podspec +++ b/MIHCrypto.podspec @@ -9,13 +9,16 @@ Pod::Spec.new do |s| s.authors = {'Michael Hohl' => 'me@michaelhohl.net'} s.source = { :git => "https://github.com/hohl/MIHCrypto.git", :tag => "#{s.version}" } - s.ios.platform = :ios, '8.0' - s.ios.deployment_target = '6.0' - s.osx.platform = :osx, '10.10' - s.osx.deployment_target = '10.8' + s.ios.deployment_target = '8.0' + s.osx.deployment_target = '10.10' s.requires_arc = true + s.xcconfig = { 'OTHER_CFLAGS' => '-DLIBRESSL', + 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/OpenSSL-Universal/lib-ios"' } + + s.libraries = 'ssl', 'crypto' + s.subspec 'Core' do |core| core.source_files = 'MIHCrypto/{Utils,Core}/*.{h,m,c}' core.dependency 'OpenSSL-Universal', '~> 1.0.1.18' diff --git a/Podfile b/Podfile index 6a07713..a26ebfd 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,10 @@ source 'https://github.com/CocoaPods/Specs.git' platform :osx, '10.8' -link_with ['MIHCrypto', 'MIHCryptoTests'] -pod 'OpenSSL-Universal', '~> 1.0.1.18' +target 'MIHCrypto' do + pod 'OpenSSL-Universal', '~> 1.0.1.18' +end + +target 'MIHCryptoTests' do + pod 'OpenSSL-Universal', '~> 1.0.1.18' +end diff --git a/Podfile.lock b/Podfile.lock index fb259a8..b554fbc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,9 +2,11 @@ PODS: - OpenSSL-Universal (1.0.1.18) DEPENDENCIES: - - OpenSSL-Universal (~> 1.0.1.s) + - OpenSSL-Universal (~> 1.0.1.18) SPEC CHECKSUMS: OpenSSL-Universal: 79fd751a7b4db41f5b430e767c9bbf681b5c8330 -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 93a6c5518186ff295073847de73df613619d4968 + +COCOAPODS: 1.1.1 From 62449ef48fc8b82ff20db90ab6d81a5e9bef7db5 Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Mon, 9 Jan 2017 13:15:37 +0200 Subject: [PATCH 2/5] update to xcode8 and force latests cocoapod version --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8647117..907b183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode8.2 xcode_workspace: MIHCrypto.xcworkspace xcode_scheme: MIHCrypto + +before_install: + - gem install cocoapods \ No newline at end of file From 8f083402cc972f58e4d338a0f22baa03ffeb7d21 Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Mon, 9 Jan 2017 13:27:26 +0200 Subject: [PATCH 3/5] rollback xcode version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 907b183..424075a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8.2 +osx_image: xcode7.2 xcode_workspace: MIHCrypto.xcworkspace xcode_scheme: MIHCrypto From 7ed5388b760a6110ec1163c2588133552098dccb Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Mon, 9 Jan 2017 13:46:31 +0200 Subject: [PATCH 4/5] added manually call to pod install --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 424075a..fd8bb45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,5 @@ xcode_workspace: MIHCrypto.xcworkspace xcode_scheme: MIHCrypto before_install: - - gem install cocoapods \ No newline at end of file + - gem install cocoapods + - pod install \ No newline at end of file From e4b02f26bfe604fefbf9467a8340e1db8a1f6665 Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Mon, 9 Jan 2017 14:30:58 +0200 Subject: [PATCH 5/5] try using xcode 8.1 --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd8bb45..9f4711f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,4 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode8.1 xcode_workspace: MIHCrypto.xcworkspace xcode_scheme: MIHCrypto - -before_install: - - gem install cocoapods - - pod install \ No newline at end of file