lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'release/0.4.1'

Browse source
This commit is contained in:
Bob Sun 2018-05-28 15:50:00 -07:00
commit ad9b9013b1
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,5 +1,5 @@
language: objective-c language: objective-c
osx_image: xcode9.2 osx_image: xcode9.3
branches: branches:
only: only:
- develop - develop

2
Cartfile
View file

@ -1,6 +1,6 @@
github "SVProgressHUD/SVProgressHUD" github "SVProgressHUD/SVProgressHUD"
github "radex/SwiftyUserDefaults" github "radex/SwiftyUserDefaults"
github "libgit2/objective-git" github "libgit2/objective-git" "0.13.0"
github "leonbreedt/FavIcon" github "leonbreedt/FavIcon"
github "kishikawakatsumi/KeychainAccess" github "kishikawakatsumi/KeychainAccess"
github "mattrubin/OneTimePassword" github "mattrubin/OneTimePassword"

2
Podfile
View file

@ -2,7 +2,7 @@ platform :ios, '10.2'
use_frameworks! use_frameworks!
target 'passKit' do 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 target 'pass' do
inherit! :search_paths inherit! :search_paths
end end

2
fastlane/travis.sh
View file

@ -3,7 +3,7 @@
gem update fastlane gem update fastlane
gem install xcodeproj gem install xcodeproj
if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then
fastlane test; fastlane test;
else else
fastlane travis; fastlane travis;
fi fi

2
pass/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.1</string> <string>0.4.1</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>

2
passExtension/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>XPC!</string> <string>XPC!</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.1</string> <string>0.4.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>1</string>
<key>NSExtension</key> <key>NSExtension</key>

2
passKit/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.1</string> <string>0.4.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>

2
passKit/Models/Password.swift
View file

@ -149,7 +149,7 @@ public class Password {
if checkDuplicatedFields(lines: fromYaml) { if checkDuplicatedFields(lines: fromYaml) {
throw AppError.YamlLoadError 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 throw AppError.YamlLoadError
} }
additions.append(contentsOf: yamlFile.map { ($0, String(describing: $1)) }) additions.append(contentsOf: yamlFile.map { ($0, String(describing: $1)) })