diff --git a/.travis.yml b/.travis.yml index f816a5f..892bab7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10.2 +osx_image: xcode11.3 language: swift cache: bundler: true @@ -16,7 +16,7 @@ jobs: install: - brew outdated cocoapods || brew upgrade cocoapods script: - - travis_wait 500 pod lib lint + - pod lib lint --verbose --allow-warnings --platforms=ios - stage: Build - Carthage And Code Coverage install: - brew outdated carthage || brew upgrade carthage diff --git a/Cartfile b/Cartfile index 9c55552..92bed89 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "krzyzanowskim/CryptoSwift" ~> 0.14.0 +github "krzyzanowskim/CryptoSwift" ~> 1.3.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 633e29f..d1bfc7a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "krzyzanowskim/CryptoSwift" "0.14.0" +github "krzyzanowskim/CryptoSwift" "1.3.1" diff --git a/MnemonicKit.podspec b/MnemonicKit.podspec index 736f483..83e38a8 100644 --- a/MnemonicKit.podspec +++ b/MnemonicKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MnemonicKit" - s.version = "1.3.10" + s.version = "1.3.11" s.summary = "MnemonicKit provides a Swift implementation of BIP39" s.description = <<-DESC MnemonicKit provides a Swift implementation of BIP39. @@ -11,13 +11,13 @@ s.homepage = "https://github.com/keefertaylor/MnemonicKit" s.license = { :type => "MIT", :file => "LICENSE" } s.author = { "Keefer Taylor" => "keefer@keefertaylor.com" } - s.source = { :git => "https://github.com/keefertaylor/MnemonicKit.git", :tag => "1.3.10" } + s.source = { :git => "https://github.com/keefertaylor/MnemonicKit.git", :tag => "1.3.11" } s.source_files = "MnemonicKit/**/*.swift", - s.swift_version = "4.2" + s.swift_version = "5.2" s.ios.deployment_target = "8.0" s.osx.deployment_target = "10.10" - s.dependency "CryptoSwift", "~> 0.14.0" + s.dependency "CryptoSwift", "~> 1.3.0" s.test_spec "Tests" do |test_spec| test_spec.source_files = "Tests/*.swift" diff --git a/MnemonicKit.xcodeproj/project.pbxproj b/MnemonicKit.xcodeproj/project.pbxproj index 6756ffd..e77ffac 100644 --- a/MnemonicKit.xcodeproj/project.pbxproj +++ b/MnemonicKit.xcodeproj/project.pbxproj @@ -81,12 +81,12 @@ 12B9024EB02AB18E1F44789A /* Mnemonic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mnemonic.swift; sourceTree = ""; }; 1645FE576891F45DC72864F6 /* MnemonicKitTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = MnemonicKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1D6F81AB601CF04F3F1E52E3 /* English.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = English.swift; sourceTree = ""; }; - 23F75813C686C37B78DE459E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 23F75813C686C37B78DE459E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 256E6CB62D82160ACBA1512E /* String+MnemonicData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+MnemonicData.swift"; sourceTree = ""; }; - 65B1627123A1131289B4110A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 65B1627123A1131289B4110A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 7DCB97C4881969FDB72C61DB /* MnemonicKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MnemonicKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BA1EBAC8ABDF9E72ABA1B642 /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = ""; }; - C3E5287598681E0527694214 /* vectors.json */ = {isa = PBXFileReference; path = vectors.json; sourceTree = ""; }; + C3E5287598681E0527694214 /* vectors.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = vectors.json; sourceTree = ""; }; D2D9394FFD7755F40E53D60E /* Data+BitArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+BitArray.swift"; sourceTree = ""; }; DC7EE929BD11BA8AB38F9C19 /* MnemonicKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MnemonicKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EBA32888ED203FE1DA16BFF1 /* MnemonicKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MnemonicKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -297,13 +297,14 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; + TargetAttributes = { + }; }; buildConfigurationList = F5079FB8BED8C51BDEEB8C7C /* Build configuration list for PBXProject "MnemonicKit" */; compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - Base, en, ); mainGroup = A44468790B8FFF397004AD5A; @@ -751,7 +752,7 @@ 5EBFFA0D3DC3BC69DCC7B348 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = ""; + defaultConfigurationName = Debug; }; 73E41074CEDAECD9E168B6DD /* Build configuration list for PBXNativeTarget "MnemonicKit_iOS" */ = { isa = XCConfigurationList; @@ -760,7 +761,7 @@ 502686BD02E44AFEF1774FB6 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = ""; + defaultConfigurationName = Debug; }; 8D81EB8096D3E6550D6B8607 /* Build configuration list for PBXNativeTarget "MnemonicKitTests_iOS" */ = { isa = XCConfigurationList; @@ -769,7 +770,7 @@ 6639A0D9B2C6E852582873D4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = ""; + defaultConfigurationName = Debug; }; 9F8727B9B5CF1651B5236875 /* Build configuration list for PBXNativeTarget "MnemonicKitTests_macOS" */ = { isa = XCConfigurationList; @@ -778,7 +779,7 @@ 7DAB3B5B81521AB12902B597 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = ""; + defaultConfigurationName = Debug; }; F5079FB8BED8C51BDEEB8C7C /* Build configuration list for PBXProject "MnemonicKit" */ = { isa = XCConfigurationList; diff --git a/MnemonicKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MnemonicKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 919434a..b7aa771 100644 --- a/MnemonicKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/MnemonicKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:MnemonicKit.xcodeproj"> diff --git a/MnemonicKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MnemonicKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MnemonicKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/MnemonicKit.xcodeproj/xcshareddata/xcschemes/MnemonicKit_iOS.xcscheme b/MnemonicKit.xcodeproj/xcshareddata/xcschemes/MnemonicKit_iOS.xcscheme index 6da9e22..c08dd5f 100644 --- a/MnemonicKit.xcodeproj/xcshareddata/xcschemes/MnemonicKit_iOS.xcscheme +++ b/MnemonicKit.xcodeproj/xcshareddata/xcschemes/MnemonicKit_iOS.xcscheme @@ -52,10 +52,6 @@ - - - - - - - - - - - - (mutating: bytes)) != -1 else { + var bytes = [UInt8](repeating: 0, count: count) + let status = SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes) + guard status == errSecSuccess else { return nil } - let data = Data(bytes) - let hexString = data.toHexString() + let hexString = bytes.toHexString() return mnemonicString(from: hexString, language: language) } diff --git a/project.yml b/project.yml index 2d8da1b..59d2503 100644 --- a/project.yml +++ b/project.yml @@ -12,7 +12,7 @@ targets: sources: [MnemonicKit] scheme: testTargets: - - MnemonicKitTests_$platform + - MnemonicKitTests_${platform} gatherCoverageData: true postCompileScripts: - script: swiftlint autocorrect --config .swiftlint.yml @@ -24,4 +24,4 @@ targets: platform: [iOS, macOS] sources: [Tests] dependencies: - - target: MnemonicKit_$platform + - target: MnemonicKit_${platform}