Skip to content

Commit

Permalink
update podspec: link to GRKOpenSSLFramework 1.0.1.20.3; link example …
Browse files Browse the repository at this point in the history 
…to release_0.9.5 branch;
  • Loading branch information
@vixentael
vixentael committed Aug 31, 2017
1 parent 641ec7c commit 7d676ac
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 15 deletions.
1 change: 0 additions & 1 deletion docs/examples/objc/Podfile
View file
Expand Up @@ -22,7 +22,6 @@ inhibit_all_warnings!

target :"ThemisTest" do

# if you feel adventurous, link example to head
pod 'themis', :git => "https://github.com/cossacklabs/themis.git", :branch => 'release_0.9.5'

#pod 'themis', '0.9.5'
Expand Down
4 changes: 1 addition & 3 deletions docs/examples/swift/Podfile
View file
Expand Up @@ -24,9 +24,7 @@ use_frameworks!

target :"ThemisSwift" do

#pod 'themis', :git => "https://github.com/cossacklabs/themis.git", :branch => 'podspec_dynamic_frameworks_GRKOpenSSLFramework'

pod 'themis', :podspec => 'https://gist.githubusercontent.com/vixentael/30300a22ee00b5d1f5eb752d79aff51b/raw/fe1fc89a7fa6f05fd861524dbea50d552b933393/themis_dyn_frm.podspec'
pod 'themis', :git => "https://github.com/cossacklabs/themis.git", :branch => 'release_0.9.5'

#pod 'themis', '0.9.5'

Expand Down
20 changes: 10 additions & 10 deletions docs/examples/swift/Podfile.lock
View file
@@ -1,31 +1,31 @@
PODS:
- GRKOpenSSLFramework (1.0.1.20.2)
- GRKOpenSSLFramework (1.0.1.20.3)
- themis (0.9.5):
- GRKOpenSSLFramework (= 1.0.1.20.2)
- GRKOpenSSLFramework (= 1.0.1.20.3)
- themis/core (= 0.9.5)
- themis/objcwrapper (= 0.9.5)
- themis/core (0.9.5):
- GRKOpenSSLFramework (= 1.0.1.20.2)
- GRKOpenSSLFramework (= 1.0.1.20.3)
- themis/objcwrapper (0.9.5):
- GRKOpenSSLFramework (= 1.0.1.20.2)
- GRKOpenSSLFramework (= 1.0.1.20.3)
- themis/core

DEPENDENCIES:
- themis (from `https://gist.githubusercontent.com/vixentael/30300a22ee00b5d1f5eb752d79aff51b/raw/fe1fc89a7fa6f05fd861524dbea50d552b933393/themis_dyn_frm.podspec`)
- themis (from `https://gist.githubusercontent.com/vixentael/30300a22ee00b5d1f5eb752d79aff51b/raw/c9976adc1735a2b2c08396164dfbee91509a868d/themis_dyn_frm.podspec`)

EXTERNAL SOURCES:
themis:
:podspec: https://gist.githubusercontent.com/vixentael/30300a22ee00b5d1f5eb752d79aff51b/raw/fe1fc89a7fa6f05fd861524dbea50d552b933393/themis_dyn_frm.podspec
:podspec: https://gist.githubusercontent.com/vixentael/30300a22ee00b5d1f5eb752d79aff51b/raw/c9976adc1735a2b2c08396164dfbee91509a868d/themis_dyn_frm.podspec

CHECKOUT OPTIONS:
themis:
:commit: 8e06e11c208e2088b3be63679bb81832c812bb78
:commit: 641ec7ca105a924e5a10a94d4e7d66ef764c9b9b
:git: https://github.com/cossacklabs/themis.git

SPEC CHECKSUMS:
GRKOpenSSLFramework: 9d5c98373a9bbb4e37101ffb9e5bb20069dde183
themis: b721d04c192bfd2cd128010067d84e6b9cf301d3
GRKOpenSSLFramework: 3a689464f4f9362d9e53a26cb245c0e5d7686df3
themis: 8daf21b5af21273f2857f60c45f8c4966ac15cc2

PODFILE CHECKSUM: 6ea86cb4083706e05e12f538e4ca686cc925dad0
PODFILE CHECKSUM: f53f6a9dad3b0360b34ff4bff835f737dbd24ae3

COCOAPODS: 1.3.1
82 changes: 82 additions & 0 deletions docs/examples/swift/ThemisSwift/ThemisSwift.xcodeproj/project.pbxproj
View file
Expand Up @@ -16,9 +16,12 @@
739981441CC449010095138F /* client.pub in Resources */ = {isa = PBXBuildFile; fileRef = 739981381CC449010095138F /* client.pub */; };
739981451CC449010095138F /* server.priv in Resources */ = {isa = PBXBuildFile; fileRef = 739981391CC449010095138F /* server.priv */; };
739981461CC449010095138F /* server.pub in Resources */ = {isa = PBXBuildFile; fileRef = 7399813A1CC449010095138F /* server.pub */; };
F83AE07CC7440F1F888A03F1 /* Pods_ThemisSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B6884AE55F93734FCA13ACC /* Pods_ThemisSwift.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0B6884AE55F93734FCA13ACC /* Pods_ThemisSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ThemisSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3881FB0EBE9DCF69A01283DD /* Pods-ThemisSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ThemisSwift.release.xcconfig"; path = "../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift.release.xcconfig"; sourceTree = "<group>"; };
739981171CC42C880095138F /* ThemisSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ThemisSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
7399812E1CC449010095138F /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7399812F1CC449010095138F /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -31,13 +34,15 @@
7399813A1CC449010095138F /* server.pub */ = {isa = PBXFileReference; lastKnownFileType = file; path = server.pub; sourceTree = "<group>"; };
739981491CC44ABA0095138F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7399814A1CC44ABA0095138F /* ThemisSwift-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ThemisSwift-Bridging-Header.h"; sourceTree = "<group>"; };
8813391E85AE8A9B312B5C33 /* Pods-ThemisSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ThemisSwift.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
739981141CC42C880095138F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F83AE07CC7440F1F888A03F1 /* Pods_ThemisSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -49,6 +54,8 @@
children = (
739981191CC42C880095138F /* ThemisSwift */,
739981181CC42C880095138F /* Products */,
7BDA9137E4C399D7421A182B /* Pods */,
B0AA93F48DC4CC6C01BE3147 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -110,17 +117,37 @@
name = "Supporting Files";
sourceTree = "<group>";
};
7BDA9137E4C399D7421A182B /* Pods */ = {
isa = PBXGroup;
children = (
8813391E85AE8A9B312B5C33 /* Pods-ThemisSwift.debug.xcconfig */,
3881FB0EBE9DCF69A01283DD /* Pods-ThemisSwift.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
B0AA93F48DC4CC6C01BE3147 /* Frameworks */ = {
isa = PBXGroup;
children = (
0B6884AE55F93734FCA13ACC /* Pods_ThemisSwift.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
739981161CC42C880095138F /* ThemisSwift */ = {
isa = PBXNativeTarget;
buildConfigurationList = 739981291CC42C880095138F /* Build configuration list for PBXNativeTarget "ThemisSwift" */;
buildPhases = (
5CB0C4B08717EE7EC326A134 /* [CP] Check Pods Manifest.lock */,
739981131CC42C880095138F /* Sources */,
739981141CC42C880095138F /* Frameworks */,
739981151CC42C880095138F /* Resources */,
73688AFE1CC4504F00D3C430 /* ShellScript */,
41D6D90273165256774C936F /* [CP] Embed Pods Frameworks */,
25837F4233AE068EF7EDFB1D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -183,6 +210,59 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
25837F4233AE068EF7EDFB1D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift-resources.sh\"\n";
showEnvVarsInLog = 0;
};
41D6D90273165256774C936F /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift-frameworks.sh",
"${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework",
"${BUILT_PRODUCTS_DIR}/themis/themis.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/themis.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ThemisSwift/Pods-ThemisSwift-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5CB0C4B08717EE7EC326A134 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ThemisSwift-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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;
};
73688AFE1CC4504F00D3C430 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -320,6 +400,7 @@
};
7399812A1CC42C880095138F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8813391E85AE8A9B312B5C33 /* Pods-ThemisSwift.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/ThemisSwift/Info.plist";
Expand All @@ -334,6 +415,7 @@
};
7399812B1CC42C880095138F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3881FB0EBE9DCF69A01283DD /* Pods-ThemisSwift.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/ThemisSwift/Info.plist";
Expand Down
2 changes: 1 addition & 1 deletion themis.podspec
View file
Expand Up @@ -9,7 +9,7 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/cossacklabs/themis.git", :branch => "podspec_dynamic_frameworks_GRKOpenSSLFramework" }
s.author = {'cossacklabs' => 'info@cossacklabs.com'}

s.dependency 'GRKOpenSSLFramework', '1.0.1.20.2'
s.dependency 'GRKOpenSSLFramework', '1.0.1.20.3'

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
Expand Down

0 comments on commit 7d676ac

Please sign in to comment.