Skip to content

Commit

Permalink
point to official SCrypto, bump podspec for release, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nickvelloff committed Jan 5, 2017
1 parent 096b92f commit f7961cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 40 deletions.
9 changes: 0 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +0,0 @@
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/SCrypto"]
path = Carthage/Checkouts/SCrypto
url = https://github.com/sgl0v/SCrypto.git
2 changes: 1 addition & 1 deletion ImgFlo.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ImgFlo"
s.version = "0.4.0"
s.version = "0.4.1"
s.summary = "Conveniently produce authorized imgflo URLs."
s.homepage = "https://github.com/the-grid/ImgFlo.swift"
s.license = { :type => "MIT" }
Expand Down
16 changes: 4 additions & 12 deletions ImgFlo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
146251D03AAA92D61E0584E4 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -416,7 +416,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
23CDBF2F2DF90A70A05CBBE6 /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -461,7 +461,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
903F053D742CA9157E4C24AE /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -491,7 +491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
D6B5B749BC0EE6A25E2649CD /* [CP] Embed Pods Frameworks */ = {
Expand Down Expand Up @@ -696,7 +696,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 2F1CA119E5AE640FC9EBCDC6 /* Pods-ImgFlo-Mac.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
Expand Down Expand Up @@ -731,7 +730,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 99AA33FDE618D891C761A52E /* Pods-ImgFlo-Mac.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
Expand Down Expand Up @@ -763,7 +761,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6137FCA34D34C03A45B48EB5 /* Pods-ImgFlo-MacTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -796,7 +793,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 704852BB4A569793049872CE /* Pods-ImgFlo-MacTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ImgFloTests/Info.plist;
Expand Down Expand Up @@ -824,7 +820,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = ACFA145DF492014F2E6A254A /* Pods-ImgFlo-iOS.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
Expand Down Expand Up @@ -857,7 +852,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D795D9714A9D782F4D14F5CA /* Pods-ImgFlo-iOS.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
Expand All @@ -884,7 +878,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 9CE9D067C53C62503A6DDAC6 /* Pods-ImgFlo-iOSTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
Expand All @@ -907,7 +900,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6F27C1272B74490C0AB55C91 /* Pods-ImgFlo-iOSTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def testing_pods
end

def default_pods
pod 'SCrypto', :git => 'https://github.com/Eke/SCrypto.git'
pod 'SCrypto', '2.0.0'
end

target 'ImgFlo-iOS' do
Expand Down
25 changes: 8 additions & 17 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
PODS:
- Nimble (5.0.0)
- Quick (0.10.0)
- Nimble (5.1.1)
- Quick (1.0.0)
- SCrypto (2.0.0)

DEPENDENCIES:
- Nimble
- Quick
- SCrypto (from `https://github.com/Eke/SCrypto.git`)

EXTERNAL SOURCES:
SCrypto:
:git: https://github.com/Eke/SCrypto.git

CHECKOUT OPTIONS:
SCrypto:
:commit: 17597eb4597bbb467054a16a049de98f241e0b77
:git: https://github.com/Eke/SCrypto.git
- SCrypto (= 2.0.0)

SPEC CHECKSUMS:
Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
SCrypto: 92aaa31272aea33279985e318b1f97294c6a6643
Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
SCrypto: 8287dcf6151df38f9bc0efad2ed982c54a96d1b8

PODFILE CHECKSUM: 79aa03e52547db84f09ed4689966ddfa0a8d37be
PODFILE CHECKSUM: cf661f11532c59247b1165b1d257c9f08bdfd7df

COCOAPODS: 1.0.1
COCOAPODS: 1.2.0.beta.3

0 comments on commit f7961cb

Please sign in to comment.