Merge branch 'release/0.4.1'

mssun · May 28, 2018 · ad9b901 · ad9b901
2 parents 620e11b + 447beea
commit ad9b901
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.4.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/passExtension/Info.plist b/passExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

diff --git a/passKit/Info.plist b/passKit/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git 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)) })