From f5af2a0d2174fe35696d8a9c3c3b3608f7760234 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sat, 31 Mar 2018 23:01:40 -0700 Subject: [PATCH 1/3] Use mainstream FavIcon --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 60924ca..0a50465 100644 --- a/Cartfile +++ b/Cartfile @@ -3,7 +3,7 @@ github "radex/SwiftyUserDefaults" github "libgit2/objective-git" # github "zahlz/SwiftPasscodeLock" "master" github "yishilin14/SwiftPasscodeLock" "app-extension-support" -github "mssun/FavIcon" "master" +github "leonbreedt/FavIcon" github "kishikawakatsumi/KeychainAccess" github "mattrubin/OneTimePassword" github "jpsim/Yams" From 97712aa052185a994628b0f1ce15575a3d1e408d Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sat, 31 Mar 2018 23:06:25 -0700 Subject: [PATCH 2/3] Upgrade to suggested settings of Xcode 9.3 --- pass.xcodeproj/project.pbxproj | 6 +++++- pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index b58cef1..ef17326 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -697,7 +697,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Bob Sun"; TargetAttributes = { A26075771EEC6F34005DB03E = { @@ -1413,6 +1413,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1420,6 +1421,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1471,6 +1473,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1478,6 +1481,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme index 75208fd..a455f03 100644 --- a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme +++ b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme @@ -1,6 +1,6 @@ Date: Sat, 31 Mar 2018 23:22:29 -0700 Subject: [PATCH 3/3] Fix CI issue --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1ce0f8c..51aa52e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -62,7 +62,7 @@ platform :ios do ) # ensure_git_status_clean increment_build_number( - build_number: latest_testflight_build_number(version: get_version_number, initial_build_number: 0) + 1, + build_number: latest_testflight_build_number(version: get_version_number(target: "pass"), initial_build_number: 0) + 1, xcodeproj: "pass.xcodeproj" ) # commit_version_bump(xcodeproj: "pass.xcodeproj")