From 083604677f6be9a6e0ae8c7a698e8955581fde37 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sun, 29 Apr 2018 11:58:07 -0700 Subject: [PATCH 01/13] Version bump to 0.4.0 --- pass/Info.plist | 2 +- passExtension/Info.plist | 2 +- passKit/Info.plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pass/Info.plist b/pass/Info.plist index 843bff0..2d997f5 100644 --- a/pass/Info.plist +++ b/pass/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.1 + 0.4.0 CFBundleURLTypes diff --git a/passExtension/Info.plist b/passExtension/Info.plist index 0539a9e..e1cb710 100644 --- a/passExtension/Info.plist +++ b/passExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.3.1 + 0.4.0 CFBundleVersion 1 NSExtension diff --git a/passKit/Info.plist b/passKit/Info.plist index 6612af0..113ad81 100644 --- a/passKit/Info.plist +++ b/passKit/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.3.1 + 0.4.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass From 7933fe68975d0daf691a9a851354da5341542ebc Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Thu, 3 May 2018 09:35:53 -0700 Subject: [PATCH 02/13] Use the master objective-git --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 97ca48d..02c4a5a 100644 --- a/Cartfile +++ b/Cartfile @@ -1,6 +1,6 @@ github "SVProgressHUD/SVProgressHUD" github "radex/SwiftyUserDefaults" -github "libgit2/objective-git" +github "libgit2/objective-git" "master" github "leonbreedt/FavIcon" github "kishikawakatsumi/KeychainAccess" github "mattrubin/OneTimePassword" From 1b08e9e638c49731fbf57dc4e4dd44470a6e6a3b Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Thu, 3 May 2018 10:02:19 -0700 Subject: [PATCH 03/13] Use travis_wait to extend building time --- .travis.yml | 2 +- fastlane/travis.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2387501..58842af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ branches: before_install: - echo -e "machine github.com\n login $GITHUB_ACCESS_TOKEN" >> ~/.netrc script: - - ./fastlane/travis.sh + - travis_wait 30 ./fastlane/travis.sh 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 From 3d2751005a6f361785c5d8cc4285fcf89daf431e Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Thu, 3 May 2018 10:43:18 -0700 Subject: [PATCH 04/13] Use travis_wait to extend building time --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58842af..7855c7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ branches: before_install: - echo -e "machine github.com\n login $GITHUB_ACCESS_TOKEN" >> ~/.netrc script: - - travis_wait 30 ./fastlane/travis.sh + - travis_wait 60 ./fastlane/travis.sh From 868e91e99ccc3bd32cf56f997a2bb7644600fdd1 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Tue, 15 May 2018 20:07:16 +0800 Subject: [PATCH 05/13] Update ObjectivePGP --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d805e5e4da514766619528924418a7d095f11d94 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Tue, 15 May 2018 20:07:40 +0800 Subject: [PATCH 06/13] Revert the .travis.yml file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7855c7c..2387501 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ branches: before_install: - echo -e "machine github.com\n login $GITHUB_ACCESS_TOKEN" >> ~/.netrc script: - - travis_wait 60 ./fastlane/travis.sh + - ./fastlane/travis.sh From 3c6b80e772dc0d7c5da9958a30393c61f8f37609 Mon Sep 17 00:00:00 2001 From: Yishi Lin Date: Fri, 18 May 2018 02:11:31 +0800 Subject: [PATCH 07/13] Use master of objective git --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 02c4a5a..a6a1120 100644 --- a/Cartfile +++ b/Cartfile @@ -1,6 +1,6 @@ github "SVProgressHUD/SVProgressHUD" github "radex/SwiftyUserDefaults" -github "libgit2/objective-git" "master" +github "libgit2/objective-git" github "leonbreedt/FavIcon" github "kishikawakatsumi/KeychainAccess" github "mattrubin/OneTimePassword" From 65e0cfdf1f98ccd1b947de1b70f89a3b8839c1d6 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Fri, 18 May 2018 19:05:43 +0800 Subject: [PATCH 08/13] Fix the oid error introduced by the latest ObjectiveGit --- passKit/Models/PasswordStore.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 5ae5692..0ace0f9 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -411,8 +411,8 @@ public class PasswordStore { } var commits = [GTCommit]() let enumerator = try GTEnumerator(repository: storeRepository) - if let sha = try storeRepository.headReference().targetOID.sha { - try enumerator.pushSHA(sha) + if let oid = try storeRepository.headReference().targetOID { + try enumerator.pushSHA(oid.sha) } for _ in 0 ..< count { let commit = try enumerator.nextObject(withSuccess: nil) @@ -554,7 +554,9 @@ public class PasswordStore { let newTree = try storeRepository.index().writeTree() let headReference = try storeRepository.headReference() let commitEnum = try GTEnumerator(repository: storeRepository) - try commitEnum.pushSHA(headReference.targetOID.sha!) + if let oid = headReference.targetOID { + try commitEnum.pushSHA(oid.sha) + } let parent = commitEnum.nextObject() as! GTCommit let signature = gitSignatureForNow let commit = try storeRepository.createCommit(with: newTree, message: message, author: signature, committer: signature, parents: [parent], updatingReferenceNamed: headReference.name) From 767b732e7f065e03d133f8e48fa443b67e32d6f9 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Fri, 18 May 2018 19:14:42 +0800 Subject: [PATCH 09/13] Upgrade CI version to xcode9.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 89a2018e89e7501ead3e2ead3829f43974ed53ae Mon Sep 17 00:00:00 2001 From: Yishi Lin Date: Mon, 21 May 2018 01:28:00 +0800 Subject: [PATCH 10/13] Fix a bug of showing digital entries --- passKit/Models/Password.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) }) From eabebe1a53fcf3426fcca1a67e512f8651539050 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sun, 27 May 2018 15:33:36 -0700 Subject: [PATCH 11/13] Revert "Fix the oid error introduced by the latest ObjectiveGit" This reverts commit 65e0cfdf1f98ccd1b947de1b70f89a3b8839c1d6. --- passKit/Models/PasswordStore.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 0ace0f9..5ae5692 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -411,8 +411,8 @@ public class PasswordStore { } var commits = [GTCommit]() let enumerator = try GTEnumerator(repository: storeRepository) - if let oid = try storeRepository.headReference().targetOID { - try enumerator.pushSHA(oid.sha) + if let sha = try storeRepository.headReference().targetOID.sha { + try enumerator.pushSHA(sha) } for _ in 0 ..< count { let commit = try enumerator.nextObject(withSuccess: nil) @@ -554,9 +554,7 @@ public class PasswordStore { let newTree = try storeRepository.index().writeTree() let headReference = try storeRepository.headReference() let commitEnum = try GTEnumerator(repository: storeRepository) - if let oid = headReference.targetOID { - try commitEnum.pushSHA(oid.sha) - } + try commitEnum.pushSHA(headReference.targetOID.sha!) let parent = commitEnum.nextObject() as! GTCommit let signature = gitSignatureForNow let commit = try storeRepository.createCommit(with: newTree, message: message, author: signature, committer: signature, parents: [parent], updatingReferenceNamed: headReference.name) From da5118f82610f4d795492b4a69578459d2ae27e8 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sun, 27 May 2018 15:35:33 -0700 Subject: [PATCH 12/13] Revert objectivegit version --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index a6a1120..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" From 447beeaf83748827ff9943a43d4b7e1a2a9cf3b2 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Mon, 28 May 2018 15:49:43 -0700 Subject: [PATCH 13/13] Version bump to 0.4.1 --- pass/Info.plist | 2 +- passExtension/Info.plist | 2 +- passKit/Info.plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pass/Info.plist b/pass/Info.plist index 2d997f5..5357a6f 100644 --- a/pass/Info.plist +++ b/pass/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.4.0 + 0.4.1 CFBundleURLTypes diff --git a/passExtension/Info.plist b/passExtension/Info.plist index e1cb710..b0899bb 100644 --- a/passExtension/Info.plist +++ b/passExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.4.0 + 0.4.1 CFBundleVersion 1 NSExtension diff --git a/passKit/Info.plist b/passKit/Info.plist index 113ad81..42298bd 100644 --- a/passKit/Info.plist +++ b/passKit/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.4.0 + 0.4.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass