diff --git a/.travis.yml b/.travis.yml index 2387501..3ff5af1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.2 +osx_image: xcode9.3 branches: only: - develop diff --git a/Cartfile b/Cartfile index 97ca48d..7dd6ed1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,6 +1,6 @@ github "SVProgressHUD/SVProgressHUD" github "radex/SwiftyUserDefaults" -github "libgit2/objective-git" +github "libgit2/objective-git" "0.13.0" github "leonbreedt/FavIcon" github "kishikawakatsumi/KeychainAccess" github "mattrubin/OneTimePassword" diff --git a/Podfile b/Podfile index fca1e49..c400991 100644 --- a/Podfile +++ b/Podfile @@ -2,7 +2,7 @@ platform :ios, '10.2' use_frameworks! target 'passKit' do - pod 'ObjectivePGP', :git => 'https://github.com/krzyzanowskim/ObjectivePGP.git', :tag => '0.10.0' + pod 'ObjectivePGP', :git => 'https://github.com/krzyzanowskim/ObjectivePGP.git', :tag => '0.12.0' target 'pass' do inherit! :search_paths end diff --git a/fastlane/travis.sh b/fastlane/travis.sh index f6e503e..8040c70 100755 --- a/fastlane/travis.sh +++ b/fastlane/travis.sh @@ -3,7 +3,7 @@ gem update fastlane gem install xcodeproj if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then - fastlane test; + fastlane test; else fastlane travis; fi diff --git a/pass/Info.plist b/pass/Info.plist index 843bff0..5357a6f 100644 --- a/pass/Info.plist +++ b/pass/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.1 + 0.4.1 CFBundleURLTypes diff --git a/passExtension/Info.plist b/passExtension/Info.plist index 0539a9e..b0899bb 100644 --- a/passExtension/Info.plist +++ b/passExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.3.1 + 0.4.1 CFBundleVersion 1 NSExtension diff --git a/passKit/Info.plist b/passKit/Info.plist index 6612af0..42298bd 100644 --- a/passKit/Info.plist +++ b/passKit/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.3.1 + 0.4.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/passKit/Models/Password.swift b/passKit/Models/Password.swift index ce9eff9..33587ca 100644 --- a/passKit/Models/Password.swift +++ b/passKit/Models/Password.swift @@ -149,7 +149,7 @@ public class Password { if checkDuplicatedFields(lines: fromYaml) { throw AppError.YamlLoadError } - guard let yamlFile = try Yams.load(yaml: fromYaml) as? [String: Any] else { + guard let yamlFile = try Yams.load(yaml: fromYaml) as? [String: String] else { throw AppError.YamlLoadError } additions.append(contentsOf: yamlFile.map { ($0, String(describing: $1)) })