diff --git a/.github/workflows/deploying.yml b/.github/workflows/deploying.yml index 13a6bf7..9f917c2 100644 --- a/.github/workflows/deploying.yml +++ b/.github/workflows/deploying.yml @@ -16,7 +16,7 @@ jobs: - name: Installing packages run: | brew update - brew install libtool automake cmake carthage swiftformat openssl libssh2 + brew install carthage swiftformat brew install go || brew link --overwrite go brew install swiftlint || brew link --overwrite swiftlint gem install bundler @@ -41,8 +41,7 @@ jobs: - name: Carthage if: steps.carthage-cache.outputs.cache-hit != 'true' run: | - export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/" - ./scripts/wcarthage bootstrap --platform iOS --no-use-binaries --cache-builds + carthage bootstrap --platform iOS --no-use-binaries --cache-builds --use-xcframeworks - name: GopenPGP if: steps.gopenpgp-cache.outputs.cache-hit != 'true' run: | diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 14ca1f2..d9b8d6a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,9 +10,9 @@ jobs: - name: Installing packages run: | brew update - brew install libtool automake cmake carthage swiftformat openssl libssh2 - brew install swiftlint || brew link --overwrite swiftlint + brew install carthage swiftformat brew install go || brew link --overwrite go + brew install swiftlint || brew link --overwrite swiftlint gem install bundler - uses: actions/cache@v2 id: carthage-cache @@ -35,8 +35,7 @@ jobs: - name: Carthage if: steps.carthage-cache.outputs.cache-hit != 'true' run: | - export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/" - ./scripts/wcarthage bootstrap --platform iOS --no-use-binaries --cache-builds + carthage bootstrap --platform iOS --no-use-binaries --cache-builds --use-xcframeworks - name: GopenPGP if: steps.gopenpgp-cache.outputs.cache-hit != 'true' run: ./scripts/gopenpgp_build.sh diff --git a/Cartfile b/Cartfile index c37d8e0..6a33804 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1 @@ github "SVProgressHUD/SVProgressHUD" -github "mssun/objective-git" "master" diff --git a/Cartfile.resolved b/Cartfile.resolved index dd29d73..b60baa2 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1 @@ github "SVProgressHUD/SVProgressHUD" "2.2.5" -github "mssun/objective-git" "46700019d808437b98c5ea4437a13ded8a09b218" diff --git a/README.md b/README.md index b5758e4..9af5437 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ For more, please read the [wiki page](https://github.com/mssun/passforios/wiki). ## Building Pass for iOS -1. Install Libtool, Automake, CMake, Carthage, Go, SwiftLint, and SwiftFormat: `brew install libtool automake cmake carthage go swiftlint swiftformat`. -2. Install dependencies via Carthage. Therefore, execute `./scripts/wcarthage update` and `./scripts/wcarthage bootstrap --platform iOS` in the root directory of the project. This may take some time. +1. Install Carthage, Go, SwiftLint, and SwiftFormat: `brew install carthage go swiftlint swiftformat`. +2. Install dependencies via Carthage. Therefore, execute `carthage update` and `carthage bootstrap --platform iOS --use-xcframeworks` in the root directory of the project. 3. Run `./scripts/gopenpgp_build.sh` to build GopenPGP. 5. Open the `pass.xcodeproj` file in Xcode. 6. Build & Run. diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index 79996d2..ae490bf 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -95,9 +95,11 @@ 30CCA91A232591320048CA51 /* ObjectivePGPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCA919232591320048CA51 /* ObjectivePGPInterface.swift */; }; 30DAFD4A240985A7002456E7 /* Array+Slices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30DAFD49240985A7002456E7 /* Array+Slices.swift */; }; 30DAFD4C240985E3002456E7 /* Array+SlicesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30DAFD4B240985E3002456E7 /* Array+SlicesTest.swift */; }; + 30ED1777276F8842009BA876 /* ObjectiveGit in Frameworks */ = {isa = PBXBuildFile; productRef = 30ED1776276F8842009BA876 /* ObjectiveGit */; }; 30EE3A14241AE6EC009FBB61 /* SyncRepositoryIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A69968240EF52E00B7D967 /* SyncRepositoryIntentHandler.swift */; }; 30EE3A16241E98C1009FBB61 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 30EE3A19241E98C1009FBB61 /* Intents.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; }; 30EE3A17241E98C1009FBB61 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 30EE3A19241E98C1009FBB61 /* Intents.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; }; + 30F6C1B427664C7200BE5AB2 /* SVProgressHUD.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */; }; 30FD2F78214D9E0E005E0A92 /* ParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FD2F77214D9E0E005E0A92 /* ParserTest.swift */; }; 556EC3D322335C5F00934F9C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30BF5ECA21EA8FB5000E4154 /* Localizable.strings */; }; 556EC3D422335C5F00934F9C /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 30BF5ED521ED2434000E4154 /* Localizable.stringsdict */; }; @@ -397,6 +399,7 @@ 30DAFD4B240985E3002456E7 /* Array+SlicesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+SlicesTest.swift"; sourceTree = ""; }; 30EE3A18241E98C1009FBB61 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = en; path = en.lproj/Intents.intentdefinition; sourceTree = ""; }; 30EE3A1B241E98C6009FBB61 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Intents.strings; sourceTree = ""; }; + 30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SVProgressHUD.xcframework; path = Carthage/Build/SVProgressHUD.xcframework; sourceTree = ""; }; 30FD2F77214D9E0E005E0A92 /* ParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserTest.swift; sourceTree = ""; }; 9A1EF0B324C50DD80074FEAC /* passBeta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = passBeta.entitlements; sourceTree = ""; }; 9A1EF0B424C50E780074FEAC /* passBetaAutoFillExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = passBetaAutoFillExtension.entitlements; sourceTree = ""; }; @@ -553,9 +556,11 @@ 3010CB6326DA4FE9008964D2 /* FavIcon in Frameworks */, 9A1F47FA26E5CF4B000C0E01 /* OneTimePassword in Frameworks */, 9A996C5326DDF61F00A4485D /* Base32 in Frameworks */, + 30F6C1B427664C7200BE5AB2 /* SVProgressHUD.xcframework in Frameworks */, 3032DA5426DAF4C200A7728C /* ObjectivePGP in Frameworks */, 3010CB6626DA500F008964D2 /* KeychainAccess in Frameworks */, 9A996C5826DEB0D100A4485D /* passKit.framework in Frameworks */, + 30ED1777276F8842009BA876 /* ObjectiveGit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -736,6 +741,7 @@ 9ADAB21926DDA4F600900F10 /* Frameworks */ = { isa = PBXGroup; children = ( + 30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */, 9ADAB21C26DDA52400900F10 /* Gopenpgp.xcframework */, ); name = Frameworks; @@ -1163,7 +1169,6 @@ DC917BCF1E2E8231000FDF54 /* Sources */, DC917BD01E2E8231000FDF54 /* Frameworks */, DC917BD11E2E8231000FDF54 /* Resources */, - 30663CD926DCA916006FCF08 /* Copy Carthage Frameworks */, 3005F34F24A9143C000519B5 /* SwiftFormat */, 308800C124EB0D3600E87ED3 /* SwiftLint */, 9A996C4726DDEAF100A4485D /* Remove SPM Duplicate Frameworks */, @@ -1189,6 +1194,7 @@ 3032DA5326DAF4C200A7728C /* ObjectivePGP */, 9A996C5226DDF61F00A4485D /* Base32 */, 9A1F47F926E5CF4B000C0E01 /* OneTimePassword */, + 30ED1776276F8842009BA876 /* ObjectiveGit */, ); productName = pass; productReference = DC917BD31E2E8231000FDF54 /* Pass.app */; @@ -1201,7 +1207,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1230; + LastUpgradeCheck = 1320; ORGANIZATIONNAME = "Bob Sun"; TargetAttributes = { 30A69944240EED5E00B7D967 = { @@ -1291,6 +1297,7 @@ 30A3000C26DA62F4002A734E /* XCRemoteSwiftPackageReference "Base32" */, 3032DA5226DAF4C200A7728C /* XCRemoteSwiftPackageReference "ObjectivePGP" */, 9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */, + 30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */, ); productRefGroup = DC917BD41E2E8231000FDF54 /* Products */; projectDirPath = ""; @@ -1409,26 +1416,6 @@ shellPath = /bin/sh; shellScript = ". \"${SRCROOT}/scripts/swiftformat.sh\"\n"; }; - 30663CD926DCA916006FCF08 /* Copy Carthage Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/SVProgressHUD.framework", - "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework", - ); - name = "Copy Carthage Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; 308800C124EB0D3600E87ED3 /* SwiftLint */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1895,10 +1882,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/Carthage/Build/iOS", - "$(PROJECT_DIR)/go/dist", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1907,11 +1891,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SDKROOT)/usr/include/libxml2", - "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers", - ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D BETA"; @@ -1941,7 +1922,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = pass/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1971,7 +1952,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2001,7 +1982,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passExtension/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2040,7 +2021,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 0.12.0; @@ -2070,7 +2051,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2245,7 +2226,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 0.12.0; @@ -2285,7 +2266,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 0.12.0; @@ -2314,7 +2295,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2336,7 +2317,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2365,7 +2346,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passExtension/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2400,7 +2381,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passExtension/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2429,7 +2410,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2452,7 +2433,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = passTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2506,10 +2487,7 @@ ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/Carthage/Build/iOS", - "$(PROJECT_DIR)/go/dist", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -2524,11 +2502,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SDKROOT)/usr/include/libxml2", - "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers", - ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -2583,10 +2558,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/Carthage/Build/iOS", - "$(PROJECT_DIR)/go/dist", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2595,11 +2567,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SDKROOT)/usr/include/libxml2", - "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers", - ); - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios; @@ -2628,7 +2597,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = pass/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2662,7 +2631,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = pass/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2809,6 +2778,14 @@ kind = branch; }; }; + 30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SimplyDanny/objective-git-swift-package"; + requirement = { + branch = "0.16-passforios"; + kind = branch; + }; + }; 9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mssun/OneTimePassword"; @@ -2875,6 +2852,11 @@ package = 30A3000C26DA62F4002A734E /* XCRemoteSwiftPackageReference "Base32" */; productName = Base32; }; + 30ED1776276F8842009BA876 /* ObjectiveGit */ = { + isa = XCSwiftPackageProductDependency; + package = 30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */; + productName = ObjectiveGit; + }; 9A1D1CE426E5D1CE0052028E /* OneTimePassword */ = { isa = XCSwiftPackageProductDependency; package = 9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */; diff --git a/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9623984..39a1af9 100644 --- a/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -28,6 +28,15 @@ "version": "4.2.2" } }, + { + "package": "ObjectiveGit", + "repositoryURL": "https://github.com/SimplyDanny/objective-git-swift-package", + "state": { + "branch": "0.16-passforios", + "revision": "01c4fe0c410f51484119c087f9bb4a6d3837543b", + "version": null + } + }, { "package": "ObjectivePGP", "repositoryURL": "https://github.com/krzyzanowskim/ObjectivePGP", diff --git a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme index 18cb70b..df66214 100644 --- a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme +++ b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme @@ -1,6 +1,6 @@ diff --git a/pass.xcodeproj/xcshareddata/xcschemes/passExtension.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/passExtension.xcscheme index 8a78f7e..2d20586 100644 --- a/pass.xcodeproj/xcshareddata/xcschemes/passExtension.xcscheme +++ b/pass.xcodeproj/xcshareddata/xcschemes/passExtension.xcscheme @@ -1,6 +1,6 @@ diff --git a/pass.xcodeproj/xcshareddata/xcschemes/passKit.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/passKit.xcscheme index 9cb5d7e..e033000 100644 --- a/pass.xcodeproj/xcshareddata/xcschemes/passKit.xcscheme +++ b/pass.xcodeproj/xcshareddata/xcschemes/passKit.xcscheme @@ -1,6 +1,6 @@ diff --git a/pass/Assets.xcassets/AppIcon.appiconset/Contents.json b/pass/Assets.xcassets/AppIcon.appiconset/Contents.json index ffe3703..860a5e1 100644 --- a/pass/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/pass/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -180,6 +180,13 @@ "scale" : "3x", "size" : "29x29" }, + { + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, { "filename" : "Icon-40@2x.png", "idiom" : "watch", @@ -196,6 +203,13 @@ "size" : "44x44", "subtype" : "40mm" }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, { "filename" : "Icon-50@2x-1.png", "idiom" : "watch", @@ -204,6 +218,13 @@ "size" : "50x50", "subtype" : "44mm" }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, { "filename" : "Icon-86@2x.png", "idiom" : "watch", @@ -228,6 +249,13 @@ "size" : "108x108", "subtype" : "44mm" }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, { "filename" : "Icon-Apple-Watch-App-Store-1024@1x.png", "idiom" : "watch-marketing", diff --git a/pass/Assets.xcassets/AppIconBeta.appiconset/Contents.json b/pass/Assets.xcassets/AppIconBeta.appiconset/Contents.json index 1d7a57c..4fc8075 100644 --- a/pass/Assets.xcassets/AppIconBeta.appiconset/Contents.json +++ b/pass/Assets.xcassets/AppIconBeta.appiconset/Contents.json @@ -138,6 +138,13 @@ "scale" : "3x", "size" : "29x29" }, + { + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, { "filename" : "Icon-40@2x-2.png", "idiom" : "watch", @@ -154,6 +161,13 @@ "size" : "44x44", "subtype" : "40mm" }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, { "filename" : "Icon-50@2x.png", "idiom" : "watch", @@ -162,6 +176,13 @@ "size" : "50x50", "subtype" : "44mm" }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, { "filename" : "Icon-86@2x.png", "idiom" : "watch", @@ -186,6 +207,13 @@ "size" : "108x108", "subtype" : "44mm" }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, { "filename" : "Icon-1025.png", "idiom" : "watch-marketing", diff --git a/pass/Controllers/GitRepositorySettingsTableViewController.swift b/pass/Controllers/GitRepositorySettingsTableViewController.swift index 9219d8d..9bc226c 100644 --- a/pass/Controllers/GitRepositorySettingsTableViewController.swift +++ b/pass/Controllers/GitRepositorySettingsTableViewController.swift @@ -193,8 +193,8 @@ class GitRepositorySettingsTableViewController: UITableViewController, PasswordA checkoutProgressBlock: checkoutProgressBlock ) - let gpgIdFile = self.passwordStore.storeURL.appendingPathComponent(".gpg-id").path - guard FileManager.default.fileExists(atPath: gpgIdFile) else { + let gpgIDFile = self.passwordStore.storeURL.appendingPathComponent(".gpg-id").path + guard FileManager.default.fileExists(atPath: gpgIDFile) else { self.passwordStore.eraseStoreData() SVProgressHUD.dismiss { DispatchQueue.main.async { diff --git a/scripts/wcarthage b/scripts/wcarthage deleted file mode 100755 index 0038a69..0000000 --- a/scripts/wcarthage +++ /dev/null @@ -1,22 +0,0 @@ -# This script is a work around for Carthage bug with Xcode 12. -# Source : https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md - -set -euo pipefail - -xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) -trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - -# Starting from Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise -# the build will fail on lipo due to duplicate architectures. - -CURRENT_XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | cut -d' ' -f2 | cut -d'.' -f1)00" -CURRENT_XCODE_BUILD=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3) - -echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_${CURRENT_XCODE_VERSION}__BUILD_${CURRENT_XCODE_BUILD} = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig - -echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig -echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig - -export XCODE_XCCONFIG_FILE="$xcconfig" -carthage "$@" -