Merge pull request #71 from cryptape/rc/v0.24.1

Rc/v0.24.1
citahub · May 31, 2019 · d4fe66d · d4fe66d
2 parents d40199e + 7fc9626
commit d4fe66d
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,6 @@ xcode_scheme: CITA
 xcode_destination: platform=iOS Simulator,OS=12.2,name=iPhone X
 before_install:
   - echo "{\"rpcServer\":\"$TEST_RPC_SERVER\"}" > Tests/Config.json
+  - gem install cocoapods -N
+  - pod --version
   - travis_wait pod repo update --silent
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 All notable changes to this project will be documented in this file.
 
+# [v0.24.1](https://github.com/cryptape/cita-sdk-swift/compare/v0.24...v0.24.1) (2019-05-31)
+
+### FIX
+
+* [Fix] Fix CITA.podspec's dependency bug
+
 # [v0.24](https://github.com/cryptape/cita-sdk-swift/compare/v0.23...v0.24) (2019-05-30)
 
 ### CHANGES

diff --git a/CITA.podspec b/CITA.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CITA"
-  s.version      = "0.24.0"
+  s.version      = "0.24.1"
   s.summary      = "CITA SDK implementation in Swift for iOS"
 
   s.description  = <<-DESC
@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
 
   s.dependency 'SwiftProtobuf', '~> 1.2.0'
-  s.dependency 'secp256k1_swift', '~> 1.0.3'
-  s.dependency 'CryptoSwift', '~> 0.13'
+  s.dependency "secp256k1.swift", "~> 0.1.4"
+  s.dependency 'CryptoSwift', '~> 1.0.0'
   s.dependency 'BigInt', '~> 3.1'
-  s.dependency 'PromiseKit', '~> 6.5'
+  s.dependency 'PromiseKit', '~> 6.8.4'
 end
diff --git a/CITA.xcodeproj/project.pbxproj b/CITA.xcodeproj/project.pbxproj
@@ -481,26 +481,11 @@
 			files = (
 			);
 			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CITATests/Pods-CITATests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/BigInt/BigInt.framework",
-				"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
-				"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
-				"${BUILT_PRODUCTS_DIR}/SipHash/SipHash.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
-				"${BUILT_PRODUCTS_DIR}/secp256k1.swift/secp256k1.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-CITATests/Pods-CITATests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BigInt.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SipHash.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/secp256k1.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-CITATests/Pods-CITATests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/Podfile b/Podfile
@@ -8,9 +8,9 @@ target 'CITA' do
 
   pod "SwiftProtobuf", "~> 1.2.0"
   pod "secp256k1.swift", "~> 0.1.4"
-  pod "CryptoSwift", "~> 0.13"
+  pod "CryptoSwift", "~> 1.0.0"
   pod "BigInt", "~> 3.1"
-  pod "PromiseKit", "~> 6.5"
+  pod "PromiseKit", "~> 6.8.4"
 
   pod "SwiftLint"
 end

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
   - BigInt (3.1.0):
     - SipHash (~> 1.2)
-  - CryptoSwift (0.13.0)
-  - PromiseKit (6.5.2):
-    - PromiseKit/CorePromise (= 6.5.2)
-    - PromiseKit/Foundation (= 6.5.2)
-    - PromiseKit/UIKit (= 6.5.2)
-  - PromiseKit/CorePromise (6.5.2)
-  - PromiseKit/Foundation (6.5.2):
+  - CryptoSwift (1.0.0)
+  - PromiseKit (6.8.4):
+    - PromiseKit/CorePromise (= 6.8.4)
+    - PromiseKit/Foundation (= 6.8.4)
+    - PromiseKit/UIKit (= 6.8.4)
+  - PromiseKit/CorePromise (6.8.4)
+  - PromiseKit/Foundation (6.8.4):
     - PromiseKit/CorePromise
-  - PromiseKit/UIKit (6.5.2):
+  - PromiseKit/UIKit (6.8.4):
     - PromiseKit/CorePromise
   - secp256k1.swift (0.1.4)
   - SipHash (1.2.2)
@@ -18,8 +18,8 @@ PODS:
 
 DEPENDENCIES:
   - BigInt (~> 3.1)
-  - CryptoSwift (~> 0.13)
-  - PromiseKit (~> 6.5)
+  - CryptoSwift (~> 1.0.0)
+  - PromiseKit (~> 6.8.4)
   - secp256k1.swift (~> 0.1.4)
   - SwiftLint
   - SwiftProtobuf (~> 1.2.0)
@@ -36,13 +36,13 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
-  CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
-  PromiseKit: 27c1601bfb73405871b805bcb8cf7e55c4dad3db
+  CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
+  PromiseKit: 51794a832647e7b819336dc2279039ce9f1cc49b
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
   SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
   SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
   SwiftProtobuf: 91a9856079044ef4ec762b2344c763cd9e5a73c1
 
-PODFILE CHECKSUM: 6c0144b0b3972b2e1abcf8da5af7ed150c7e9104
+PODFILE CHECKSUM: 63c78bdeb17365fd74e9d38179e3490fa886ba2e
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0
diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.24.0</string>
+	<string>0.24.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>