From 7c2de296d2213ebfbcf43369abc62eab2f813396 Mon Sep 17 00:00:00 2001 From: vixentael Date: Wed, 24 Aug 2016 16:45:35 +0300 Subject: [PATCH 1/2] update themis.podspec to be compatible with CP 1.0, upd OpenSSL dependency to 1.0.1.19 --- themis.podspec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/themis.podspec b/themis.podspec index 5709d41f9..9bbbe7775 100644 --- a/themis.podspec +++ b/themis.podspec @@ -7,20 +7,24 @@ Pod::Spec.new do |s| s.license = { :type => 'Apache 2.0'} s.source = { :git => "https://github.com/cossacklabs/themis.git", :tag => "0.9.3" } s.author = {'cossacklabs' => 'info@cossacklabs.com'} - s.dependency 'OpenSSL-Universal', '1.0.1.p' + + s.dependency 'OpenSSL-Universal', '1.0.1.19' - s.ios.platform = :ios, '7.0' s.ios.deployment_target = '7.0' - - s.osx.platform = :osx, '10.9' s.osx.deployment_target = '10.9' - s.xcconfig = { 'OTHER_CFLAGS' => '-DLIBRESSL', 'USE_HEADERMAP' => 'NO'} - + s.xcconfig = { 'OTHER_CFLAGS' => '-DLIBRESSL', 'USE_HEADERMAP' => 'NO', + 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/themis/src" "${PODS_ROOT}/themis/src/wrappers/themis/Obj-C"', + 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/OpenSSL-Universal/lib-ios"' } + + # open ssl + s.libraries = 'ssl', 'crypto' s.subspec 'core' do |ss| ss.source_files = "src/themis/*.{h,c}", "src/soter/**/*.{c,h}" ss.header_mappings_dir = "src" + ss.header_dir = 'src' + ss.preserve_paths = "src/themis/*.h", "src/soter/**/*.h" ss.public_header_files = "src/themis/*.h", "src/soter/**/*.h" end @@ -31,4 +35,4 @@ Pod::Spec.new do |s| ss.header_dir = 'objcthemis' ss.dependency 'themis/core' end -end +end \ No newline at end of file From 1163e4b51a9be18bb7c4e112454a9dcfd9c522a6 Mon Sep 17 00:00:00 2001 From: vixentael Date: Wed, 24 Aug 2016 17:22:19 +0300 Subject: [PATCH 2/2] update examples' to use new pods --- .../project.pbxproj | 18 +++++++++--------- .../project.pbxproj | 18 +++++++++--------- .../ThemisTest.xcodeproj/project.pbxproj | 18 +++++++++--------- .../ThemisSwift.xcodeproj/project.pbxproj | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/examples/Themis-server/Obj-C/WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj/project.pbxproj b/docs/examples/Themis-server/Obj-C/WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj/project.pbxproj index d5a92577e..ea344dcb4 100644 --- a/docs/examples/Themis-server/Obj-C/WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj/project.pbxproj +++ b/docs/examples/Themis-server/Obj-C/WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj/project.pbxproj @@ -181,12 +181,12 @@ isa = PBXNativeTarget; buildConfigurationList = 733BD9E41BDBF58600C6DA2F /* Build configuration list for PBXNativeTarget "WorkingWithThemisServer" */; buildPhases = ( - 794624F656ED293B3C272CF1 /* Check Pods Manifest.lock */, + 794624F656ED293B3C272CF1 /* [CP] Check Pods Manifest.lock */, 733BD9B31BDBF58500C6DA2F /* Sources */, 733BD9B41BDBF58500C6DA2F /* Frameworks */, 733BD9B51BDBF58500C6DA2F /* Resources */, - 013706136CE1D47ABDFEC437 /* Copy Pods Resources */, - FE9FD3CD2E89491EF5A06321 /* Embed Pods Frameworks */, + 013706136CE1D47ABDFEC437 /* [CP] Copy Pods Resources */, + FE9FD3CD2E89491EF5A06321 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -303,14 +303,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 013706136CE1D47ABDFEC437 /* Copy Pods Resources */ = { + 013706136CE1D47ABDFEC437 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -318,14 +318,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-WorkingWithThemisServer/Pods-WorkingWithThemisServer-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 794624F656ED293B3C272CF1 /* Check Pods Manifest.lock */ = { + 794624F656ED293B3C272CF1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -333,14 +333,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - FE9FD3CD2E89491EF5A06321 /* Embed Pods Frameworks */ = { + FE9FD3CD2E89491EF5A06321 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/docs/examples/Themis-server/swift/SwiftThemisServerExample/SwiftThemisServerExample.xcodeproj/project.pbxproj b/docs/examples/Themis-server/swift/SwiftThemisServerExample/SwiftThemisServerExample.xcodeproj/project.pbxproj index aaf362799..c36ba4344 100644 --- a/docs/examples/Themis-server/swift/SwiftThemisServerExample/SwiftThemisServerExample.xcodeproj/project.pbxproj +++ b/docs/examples/Themis-server/swift/SwiftThemisServerExample/SwiftThemisServerExample.xcodeproj/project.pbxproj @@ -103,12 +103,12 @@ isa = PBXNativeTarget; buildConfigurationList = 736DDB741CC5990900CD0C31 /* Build configuration list for PBXNativeTarget "SwiftThemisServerExample" */; buildPhases = ( - 7521C531C10F5BBDA84E6229 /* Check Pods Manifest.lock */, + 7521C531C10F5BBDA84E6229 /* [CP] Check Pods Manifest.lock */, 736DDB5E1CC5990900CD0C31 /* Sources */, 736DDB5F1CC5990900CD0C31 /* Frameworks */, 736DDB601CC5990900CD0C31 /* Resources */, - 34970ACCC23BE6291712C3E6 /* Embed Pods Frameworks */, - 218482DD932A2BEB2D27AEC9 /* Copy Pods Resources */, + 34970ACCC23BE6291712C3E6 /* [CP] Embed Pods Frameworks */, + 218482DD932A2BEB2D27AEC9 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -166,14 +166,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 218482DD932A2BEB2D27AEC9 /* Copy Pods Resources */ = { + 218482DD932A2BEB2D27AEC9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -181,14 +181,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SwiftThemisServerExample/Pods-SwiftThemisServerExample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 34970ACCC23BE6291712C3E6 /* Embed Pods Frameworks */ = { + 34970ACCC23BE6291712C3E6 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -196,14 +196,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SwiftThemisServerExample/Pods-SwiftThemisServerExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 7521C531C10F5BBDA84E6229 /* Check Pods Manifest.lock */ = { + 7521C531C10F5BBDA84E6229 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/docs/examples/objc/ThemisTest/ThemisTest.xcodeproj/project.pbxproj b/docs/examples/objc/ThemisTest/ThemisTest.xcodeproj/project.pbxproj index b172ff329..a2e1ae67d 100644 --- a/docs/examples/objc/ThemisTest/ThemisTest.xcodeproj/project.pbxproj +++ b/docs/examples/objc/ThemisTest/ThemisTest.xcodeproj/project.pbxproj @@ -188,12 +188,12 @@ isa = PBXNativeTarget; buildConfigurationList = 731624B51ADB174200972A7A /* Build configuration list for PBXNativeTarget "ThemisTest" */; buildPhases = ( - 752A804A4446800FFB3ADCD7 /* Check Pods Manifest.lock */, + 752A804A4446800FFB3ADCD7 /* [CP] Check Pods Manifest.lock */, 7316248E1ADB174200972A7A /* Sources */, 7316248F1ADB174200972A7A /* Frameworks */, 731624901ADB174200972A7A /* Resources */, - 9A078C251A561873552D1DC1 /* Copy Pods Resources */, - D4BA3E32BDAA4C42E16EDE5D /* Embed Pods Frameworks */, + 9A078C251A561873552D1DC1 /* [CP] Copy Pods Resources */, + D4BA3E32BDAA4C42E16EDE5D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -284,14 +284,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 752A804A4446800FFB3ADCD7 /* Check Pods Manifest.lock */ = { + 752A804A4446800FFB3ADCD7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -299,14 +299,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 9A078C251A561873552D1DC1 /* Copy Pods Resources */ = { + 9A078C251A561873552D1DC1 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -314,14 +314,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ThemisTest/Pods-ThemisTest-resources.sh\"\n"; showEnvVarsInLog = 0; }; - D4BA3E32BDAA4C42E16EDE5D /* Embed Pods Frameworks */ = { + D4BA3E32BDAA4C42E16EDE5D /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/docs/examples/swift/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj b/docs/examples/swift/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj index fa08dfff6..cbb56c7da 100644 --- a/docs/examples/swift/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj +++ b/docs/examples/swift/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj @@ -141,12 +141,12 @@ isa = PBXNativeTarget; buildConfigurationList = 739981291CC42C880095138F /* Build configuration list for PBXNativeTarget "ThemisSwift" */; buildPhases = ( - 639E2197E7C5E165A9FDB72A /* Check Pods Manifest.lock */, + 639E2197E7C5E165A9FDB72A /* [CP] Check Pods Manifest.lock */, 739981131CC42C880095138F /* Sources */, 739981141CC42C880095138F /* Frameworks */, 739981151CC42C880095138F /* Resources */, - BF1CE387B5ACF2A2CC59FB5F /* Embed Pods Frameworks */, - DC3FF580972B0C60E16EC322 /* Copy Pods Resources */, + BF1CE387B5ACF2A2CC59FB5F /* [CP] Embed Pods Frameworks */, + DC3FF580972B0C60E16EC322 /* [CP] Copy Pods Resources */, 73688AFE1CC4504F00D3C430 /* ShellScript */, ); buildRules = ( @@ -209,14 +209,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 639E2197E7C5E165A9FDB72A /* Check Pods Manifest.lock */ = { + 639E2197E7C5E165A9FDB72A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -237,14 +237,14 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\n# uncomment for autocorrection\n# swiftlint autocorrect\n swiftlint lint --quiet\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi"; }; - BF1CE387B5ACF2A2CC59FB5F /* Embed Pods Frameworks */ = { + BF1CE387B5ACF2A2CC59FB5F /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -252,14 +252,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - DC3FF580972B0C60E16EC322 /* Copy Pods Resources */ = { + DC3FF580972B0C60E16EC322 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0;