From 60d6767fa679f78213606579b09d4779e813ac9e Mon Sep 17 00:00:00 2001 From: HongYang Qiu Date: Fri, 20 Oct 2017 11:23:19 +0800 Subject: [PATCH] for swift4 --- .swift-version | 2 +- CKMnemonic.podspec | 2 +- CKMnemonic/.swift-version | 1 + CKMnemonic/CKMnemonic.xcodeproj/project.pbxproj | 2 ++ CKMnemonic/Pods/Pods.xcodeproj/project.pbxproj | 17 +++++++++-------- 5 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 CKMnemonic/.swift-version diff --git a/.swift-version b/.swift-version index 9f55b2c..5186d07 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +4.0 diff --git a/CKMnemonic.podspec b/CKMnemonic.podspec index 796b9d7..f5a1ad0 100644 --- a/CKMnemonic.podspec +++ b/CKMnemonic.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'CKMnemonic' - s.version = '0.1.5' + s.version = '0.1.6' s.summary = 'An implementation of BIP39 used Swift.' # This description is used to generate tags and improve search results. diff --git a/CKMnemonic/.swift-version b/CKMnemonic/.swift-version new file mode 100644 index 0000000..5186d07 --- /dev/null +++ b/CKMnemonic/.swift-version @@ -0,0 +1 @@ +4.0 diff --git a/CKMnemonic/CKMnemonic.xcodeproj/project.pbxproj b/CKMnemonic/CKMnemonic.xcodeproj/project.pbxproj index 23aaf9e..6ff65d4 100644 --- a/CKMnemonic/CKMnemonic.xcodeproj/project.pbxproj +++ b/CKMnemonic/CKMnemonic.xcodeproj/project.pbxproj @@ -479,6 +479,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -528,6 +529,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; diff --git a/CKMnemonic/Pods/Pods.xcodeproj/project.pbxproj b/CKMnemonic/Pods/Pods.xcodeproj/project.pbxproj index 4eb1b93..5fa44b5 100644 --- a/CKMnemonic/Pods/Pods.xcodeproj/project.pbxproj +++ b/CKMnemonic/Pods/Pods.xcodeproj/project.pbxproj @@ -117,9 +117,9 @@ 3E731134B2F344EE53DA99D9E1FC050A /* Pods-CKMnemonicTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-CKMnemonicTests.release.xcconfig"; sourceTree = ""; }; 3EB49B9AAA5F1E200C32B0906DFCA7C0 /* Checksum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Checksum.swift; path = Sources/CryptoSwift/Checksum.swift; sourceTree = ""; }; 4099F300D420CB342B071B11EFE6484B /* BlockModeWorker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockModeWorker.swift; path = Sources/CryptoSwift/BlockMode/BlockModeWorker.swift; sourceTree = ""; }; - 40BA8F315ED28222B9BFB5CEDE7E610C /* Pods-CKMnemonicTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-CKMnemonicTests.modulemap"; sourceTree = ""; }; + 40BA8F315ED28222B9BFB5CEDE7E610C /* Pods-CKMnemonicTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-CKMnemonicTests.modulemap"; sourceTree = ""; }; 413151642CFC7C957342C28123F75A46 /* Pods-CKMnemonicTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-CKMnemonicTests-umbrella.h"; sourceTree = ""; }; - 415DFBD44595EB68F2DAE89C5FDD81CC /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CryptoSwift.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 415DFBD44595EB68F2DAE89C5FDD81CC /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 555B8A9BE9F76A956E0570B14D393561 /* HMAC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HMAC.swift; path = Sources/CryptoSwift/HMAC.swift; sourceTree = ""; }; 5AC707DFC71407725047FABC17E23706 /* Poly1305.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Poly1305.swift; path = Sources/CryptoSwift/Poly1305.swift; sourceTree = ""; }; 60879100EDB2AC7AE74760CCEC55AC26 /* CryptoSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CryptoSwift.xcconfig; sourceTree = ""; }; @@ -138,7 +138,7 @@ 8D18E9456898778AB5B1F8A6AC9E8FA3 /* Padding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Padding.swift; path = Sources/CryptoSwift/Padding.swift; sourceTree = ""; }; 8DC582EDEFA53D225E83DCB01949B014 /* SHA3.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SHA3.swift; path = Sources/CryptoSwift/SHA3.swift; sourceTree = ""; }; 8FBCC4B1237BE62485DBB7D15254FE97 /* Cipher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cipher.swift; path = Sources/CryptoSwift/Cipher.swift; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9B3818F541D7E2AF74FB98D6F879D7FB /* UInt16+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UInt16+Extension.swift"; path = "Sources/CryptoSwift/UInt16+Extension.swift"; sourceTree = ""; }; 9BC8030396BA103AB7092AC6CD83588E /* CSArrayType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CSArrayType+Extensions.swift"; path = "Sources/CryptoSwift/CSArrayType+Extensions.swift"; sourceTree = ""; }; A1B3A8C9A13144E7EB4562B159F3EC68 /* BatchedCollection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BatchedCollection.swift; path = Sources/CryptoSwift/BatchedCollection.swift; sourceTree = ""; }; @@ -151,7 +151,7 @@ AD064C03D24F7263981F4E36AEEC3110 /* Pods-CKMnemonicTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-CKMnemonicTests-resources.sh"; sourceTree = ""; }; AEC3DEEB4D54C2FC7E3C5C483B2F0390 /* Pods-CKMnemonicTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-CKMnemonicTests-acknowledgements.markdown"; sourceTree = ""; }; AF3A063028D8CDDB163B2AFE5CE90516 /* RandomBytesSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RandomBytesSequence.swift; path = Sources/CryptoSwift/RandomBytesSequence.swift; sourceTree = ""; }; - AF560A025C803F5252A1BE3B178401DE /* Pods-CKMnemonic.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-CKMnemonic.modulemap"; sourceTree = ""; }; + AF560A025C803F5252A1BE3B178401DE /* Pods-CKMnemonic.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-CKMnemonic.modulemap"; sourceTree = ""; }; B1F734FC105583DE2FBA9FD469EA6E53 /* DigestType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DigestType.swift; path = Sources/CryptoSwift/DigestType.swift; sourceTree = ""; }; B806566786422E1BE60B46DADA26C2DB /* Pods-CKMnemonic-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-CKMnemonic-resources.sh"; sourceTree = ""; }; BACF0144DAEBE5E39A3DB94CBB432B75 /* CTR.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CTR.swift; path = Sources/CryptoSwift/BlockMode/CTR.swift; sourceTree = ""; }; @@ -159,9 +159,9 @@ BBADFB7F3EF39C54AF6CCBD2824A337A /* OFB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OFB.swift; path = Sources/CryptoSwift/BlockMode/OFB.swift; sourceTree = ""; }; BC3FE8F0B53146E5D03AC4F654501916 /* Generics.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generics.swift; path = Sources/CryptoSwift/Generics.swift; sourceTree = ""; }; C03C6F639996A90ECAD26F3842E876C3 /* Int+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Int+Extension.swift"; path = "Sources/CryptoSwift/Int+Extension.swift"; sourceTree = ""; }; - C1A808653AF0CC9F1C4FE81D753FA2C2 /* Pods_CKMnemonicTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_CKMnemonicTests.framework; path = "Pods-CKMnemonicTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + C1A808653AF0CC9F1C4FE81D753FA2C2 /* Pods_CKMnemonicTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CKMnemonicTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C31351A6BC656FE6FA5FD18817715982 /* CryptoSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CryptoSwift-dummy.m"; sourceTree = ""; }; - C7850F7863A8C69AC0E1419F087CD258 /* CryptoSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = CryptoSwift.modulemap; sourceTree = ""; }; + C7850F7863A8C69AC0E1419F087CD258 /* CryptoSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = CryptoSwift.modulemap; sourceTree = ""; }; CC48FDC56414E25865B31EAC0EC13FC3 /* CBC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CBC.swift; path = Sources/CryptoSwift/BlockMode/CBC.swift; sourceTree = ""; }; CD875EC99134EC318AB0797BB9D25592 /* SecureBytes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SecureBytes.swift; path = Sources/CryptoSwift/SecureBytes.swift; sourceTree = ""; }; DA30689D1C2A6D02E1CBDE08787EBFEC /* String+FoundationExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+FoundationExtension.swift"; path = "Sources/CryptoSwift/Foundation/String+FoundationExtension.swift"; sourceTree = ""; }; @@ -183,7 +183,7 @@ F3B753F6D198107A962F62EF48F82D21 /* CryptoSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CryptoSwift-umbrella.h"; sourceTree = ""; }; FA028689C8364D68AD70CAF0C2D9E0B0 /* RandomAccessCryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RandomAccessCryptor.swift; path = Sources/CryptoSwift/RandomAccessCryptor.swift; sourceTree = ""; }; FE17F52E6A54308751FDC439CB9FF595 /* NoPadding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NoPadding.swift; path = Sources/CryptoSwift/NoPadding.swift; sourceTree = ""; }; - FF6BBEA9B01C0E95AA201E095839FCC1 /* Pods_CKMnemonic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_CKMnemonic.framework; path = "Pods-CKMnemonic.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + FF6BBEA9B01C0E95AA201E095839FCC1 /* Pods_CKMnemonic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CKMnemonic.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -281,7 +281,6 @@ 31DE7CCE7C627DFA964F5EBFCC2E0BC4 /* ZeroPadding.swift */, B8954F96BA08773B513FBB436ABEF57A /* Support Files */, ); - name = CryptoSwift; path = CryptoSwift; sourceTree = ""; }; @@ -712,6 +711,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_VERSION = 4.0; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -806,6 +806,7 @@ PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 4.0; SYMROOT = "${SRCROOT}/../build"; }; name = Debug;