Skip to content

Commit e5bd678

Browse files
SimplyDannySimplyDanny
authored
Consume ObjectiveGit through a binary Swift package (#528)
1 parent 3030e1d commit e5bd678

File tree

16 files changed

+128
-104
lines changed

16 files changed

+128
-104
lines changed

‎.github/workflows/deploying.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Installing packages
1717
run: |
1818
brew update
19-
brew install libtool automake cmake carthage swiftformat openssl libssh2
19+
brew install carthage swiftformat
2020
brew install go || brew link --overwrite go
2121
brew install swiftlint || brew link --overwrite swiftlint
2222
gem install bundler
@@ -41,8 +41,7 @@ jobs:
4141
- name: Carthage
4242
if: steps.carthage-cache.outputs.cache-hit != 'true'
4343
run: |
44-
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/"
45-
./scripts/wcarthage bootstrap --platform iOS --no-use-binaries --cache-builds
44+
carthage bootstrap --platform iOS --no-use-binaries --cache-builds --use-xcframeworks
4645
- name: GopenPGP
4746
if: steps.gopenpgp-cache.outputs.cache-hit != 'true'
4847
run: |

‎.github/workflows/testing.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
- name: Installing packages
1111
run: |
1212
brew update
13-
brew install libtool automake cmake carthage swiftformat openssl libssh2
14-
brew install swiftlint || brew link --overwrite swiftlint
13+
brew install carthage swiftformat
1514
brew install go || brew link --overwrite go
15+
brew install swiftlint || brew link --overwrite swiftlint
1616
gem install bundler
1717
- uses: actions/cache@v2
1818
id: carthage-cache
@@ -35,8 +35,7 @@ jobs:
3535
- name: Carthage
3636
if: steps.carthage-cache.outputs.cache-hit != 'true'
3737
run: |
38-
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/"
39-
./scripts/wcarthage bootstrap --platform iOS --no-use-binaries --cache-builds
38+
carthage bootstrap --platform iOS --no-use-binaries --cache-builds --use-xcframeworks
4039
- name: GopenPGP
4140
if: steps.gopenpgp-cache.outputs.cache-hit != 'true'
4241
run: ./scripts/gopenpgp_build.sh

‎Cartfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
github "SVProgressHUD/SVProgressHUD"
2-
github "mssun/objective-git" "master"

‎Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
github "SVProgressHUD/SVProgressHUD" "2.2.5"
2-
github "mssun/objective-git" "46700019d808437b98c5ea4437a13ded8a09b218"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ For more, please read the [wiki page](https://github.com/mssun/passforios/wiki).
4646

4747
## Building Pass for iOS
4848

49-
1. Install Libtool, Automake, CMake, Carthage, Go, SwiftLint, and SwiftFormat: `brew install libtool automake cmake carthage go swiftlint swiftformat`.
50-
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.
49+
1. Install Carthage, Go, SwiftLint, and SwiftFormat: `brew install carthage go swiftlint swiftformat`.
50+
2. Install dependencies via Carthage. Therefore, execute `carthage update` and `carthage bootstrap --platform iOS --use-xcframeworks` in the root directory of the project.
5151
3. Run `./scripts/gopenpgp_build.sh` to build GopenPGP.
5252
5. Open the `pass.xcodeproj` file in Xcode.
5353
6. Build & Run.

‎pass.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,11 @@
9595
30CCA91A232591320048CA51 /* ObjectivePGPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCA919232591320048CA51 /* ObjectivePGPInterface.swift */; };
9696
30DAFD4A240985A7002456E7 /* Array+Slices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30DAFD49240985A7002456E7 /* Array+Slices.swift */; };
9797
30DAFD4C240985E3002456E7 /* Array+SlicesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30DAFD4B240985E3002456E7 /* Array+SlicesTest.swift */; };
98+
30ED1777276F8842009BA876 /* ObjectiveGit in Frameworks */ = {isa = PBXBuildFile; productRef = 30ED1776276F8842009BA876 /* ObjectiveGit */; };
9899
30EE3A14241AE6EC009FBB61 /* SyncRepositoryIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A69968240EF52E00B7D967 /* SyncRepositoryIntentHandler.swift */; };
99100
30EE3A16241E98C1009FBB61 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 30EE3A19241E98C1009FBB61 /* Intents.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; };
100101
30EE3A17241E98C1009FBB61 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 30EE3A19241E98C1009FBB61 /* Intents.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; };
102+
30F6C1B427664C7200BE5AB2 /* SVProgressHUD.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */; };
101103
30FD2F78214D9E0E005E0A92 /* ParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FD2F77214D9E0E005E0A92 /* ParserTest.swift */; };
102104
556EC3D322335C5F00934F9C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30BF5ECA21EA8FB5000E4154 /* Localizable.strings */; };
103105
556EC3D422335C5F00934F9C /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 30BF5ED521ED2434000E4154 /* Localizable.stringsdict */; };
@@ -397,6 +399,7 @@
397399
30DAFD4B240985E3002456E7 /* Array+SlicesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+SlicesTest.swift"; sourceTree = "<group>"; };
398400
30EE3A18241E98C1009FBB61 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = en; path = en.lproj/Intents.intentdefinition; sourceTree = "<group>"; };
399401
30EE3A1B241E98C6009FBB61 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Intents.strings; sourceTree = "<group>"; };
402+
30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SVProgressHUD.xcframework; path = Carthage/Build/SVProgressHUD.xcframework; sourceTree = "<group>"; };
400403
30FD2F77214D9E0E005E0A92 /* ParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserTest.swift; sourceTree = "<group>"; };
401404
9A1EF0B324C50DD80074FEAC /* passBeta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = passBeta.entitlements; sourceTree = "<group>"; };
402405
9A1EF0B424C50E780074FEAC /* passBetaAutoFillExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = passBetaAutoFillExtension.entitlements; sourceTree = "<group>"; };
@@ -553,9 +556,11 @@
553556
3010CB6326DA4FE9008964D2 /* FavIcon in Frameworks */,
554557
9A1F47FA26E5CF4B000C0E01 /* OneTimePassword in Frameworks */,
555558
9A996C5326DDF61F00A4485D /* Base32 in Frameworks */,
559+
30F6C1B427664C7200BE5AB2 /* SVProgressHUD.xcframework in Frameworks */,
556560
3032DA5426DAF4C200A7728C /* ObjectivePGP in Frameworks */,
557561
3010CB6626DA500F008964D2 /* KeychainAccess in Frameworks */,
558562
9A996C5826DEB0D100A4485D /* passKit.framework in Frameworks */,
563+
30ED1777276F8842009BA876 /* ObjectiveGit in Frameworks */,
559564
);
560565
runOnlyForDeploymentPostprocessing = 0;
561566
};
@@ -736,6 +741,7 @@
736741
9ADAB21926DDA4F600900F10 /* Frameworks */ = {
737742
isa = PBXGroup;
738743
children = (
744+
30F6C1B327664C7200BE5AB2 /* SVProgressHUD.xcframework */,
739745
9ADAB21C26DDA52400900F10 /* Gopenpgp.xcframework */,
740746
);
741747
name = Frameworks;
@@ -1163,7 +1169,6 @@
11631169
DC917BCF1E2E8231000FDF54 /* Sources */,
11641170
DC917BD01E2E8231000FDF54 /* Frameworks */,
11651171
DC917BD11E2E8231000FDF54 /* Resources */,
1166-
30663CD926DCA916006FCF08 /* Copy Carthage Frameworks */,
11671172
3005F34F24A9143C000519B5 /* SwiftFormat */,
11681173
308800C124EB0D3600E87ED3 /* SwiftLint */,
11691174
9A996C4726DDEAF100A4485D /* Remove SPM Duplicate Frameworks */,
@@ -1189,6 +1194,7 @@
11891194
3032DA5326DAF4C200A7728C /* ObjectivePGP */,
11901195
9A996C5226DDF61F00A4485D /* Base32 */,
11911196
9A1F47F926E5CF4B000C0E01 /* OneTimePassword */,
1197+
30ED1776276F8842009BA876 /* ObjectiveGit */,
11921198
);
11931199
productName = pass;
11941200
productReference = DC917BD31E2E8231000FDF54 /* Pass.app */;
@@ -1201,7 +1207,7 @@
12011207
isa = PBXProject;
12021208
attributes = {
12031209
LastSwiftUpdateCheck = 1130;
1204-
LastUpgradeCheck = 1230;
1210+
LastUpgradeCheck = 1320;
12051211
ORGANIZATIONNAME = "Bob Sun";
12061212
TargetAttributes = {
12071213
30A69944240EED5E00B7D967 = {
@@ -1291,6 +1297,7 @@
12911297
30A3000C26DA62F4002A734E /* XCRemoteSwiftPackageReference "Base32" */,
12921298
3032DA5226DAF4C200A7728C /* XCRemoteSwiftPackageReference "ObjectivePGP" */,
12931299
9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */,
1300+
30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */,
12941301
);
12951302
productRefGroup = DC917BD41E2E8231000FDF54 /* Products */;
12961303
projectDirPath = "";
@@ -1409,26 +1416,6 @@
14091416
shellPath = /bin/sh;
14101417
shellScript = ". \"${SRCROOT}/scripts/swiftformat.sh\"\n";
14111418
};
1412-
30663CD926DCA916006FCF08 /* Copy Carthage Frameworks */ = {
1413-
isa = PBXShellScriptBuildPhase;
1414-
buildActionMask = 2147483647;
1415-
files = (
1416-
);
1417-
inputFileListPaths = (
1418-
);
1419-
inputPaths = (
1420-
"$(SRCROOT)/Carthage/Build/iOS/SVProgressHUD.framework",
1421-
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework",
1422-
);
1423-
name = "Copy Carthage Frameworks";
1424-
outputFileListPaths = (
1425-
);
1426-
outputPaths = (
1427-
);
1428-
runOnlyForDeploymentPostprocessing = 0;
1429-
shellPath = /bin/sh;
1430-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
1431-
};
14321419
308800C124EB0D3600E87ED3 /* SwiftLint */ = {
14331420
isa = PBXShellScriptBuildPhase;
14341421
buildActionMask = 2147483647;
@@ -1895,10 +1882,7 @@
18951882
ENABLE_NS_ASSERTIONS = NO;
18961883
ENABLE_ON_DEMAND_RESOURCES = NO;
18971884
ENABLE_STRICT_OBJC_MSGSEND = YES;
1898-
FRAMEWORK_SEARCH_PATHS = (
1899-
"$(PROJECT_DIR)/Carthage/Build/iOS",
1900-
"$(PROJECT_DIR)/go/dist",
1901-
);
1885+
FRAMEWORK_SEARCH_PATHS = "";
19021886
GCC_C_LANGUAGE_STANDARD = gnu99;
19031887
GCC_NO_COMMON_BLOCKS = YES;
19041888
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1907,11 +1891,8 @@
19071891
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
19081892
GCC_WARN_UNUSED_FUNCTION = YES;
19091893
GCC_WARN_UNUSED_VARIABLE = YES;
1910-
HEADER_SEARCH_PATHS = (
1911-
"$(SDKROOT)/usr/include/libxml2",
1912-
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers",
1913-
);
1914-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1894+
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
1895+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19151896
LD_RUNPATH_SEARCH_PATHS = "";
19161897
MTL_ENABLE_DEBUG_INFO = NO;
19171898
OTHER_SWIFT_FLAGS = "-D BETA";
@@ -1941,7 +1922,7 @@
19411922
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19421923
HEADER_SEARCH_PATHS = "$(inherited)";
19431924
INFOPLIST_FILE = pass/Info.plist;
1944-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1925+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19451926
LD_RUNPATH_SEARCH_PATHS = (
19461927
"$(inherited)",
19471928
"@executable_path/Frameworks",
@@ -1971,7 +1952,7 @@
19711952
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19721953
HEADER_SEARCH_PATHS = "$(inherited)";
19731954
INFOPLIST_FILE = passTests/Info.plist;
1974-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1955+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19751956
LD_RUNPATH_SEARCH_PATHS = (
19761957
"$(inherited)",
19771958
"@executable_path/Frameworks",
@@ -2001,7 +1982,7 @@
20011982
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
20021983
HEADER_SEARCH_PATHS = "$(inherited)";
20031984
INFOPLIST_FILE = passExtension/Info.plist;
2004-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1985+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20051986
LD_RUNPATH_SEARCH_PATHS = (
20061987
"$(inherited)",
20071988
"@executable_path/Frameworks",
@@ -2040,7 +2021,7 @@
20402021
HEADER_SEARCH_PATHS = "$(inherited)";
20412022
INFOPLIST_FILE = passKit/Info.plist;
20422023
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2043-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2024+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20442025
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
20452026
LIBRARY_SEARCH_PATHS = "$(inherited)";
20462027
MARKETING_VERSION = 0.12.0;
@@ -2070,7 +2051,7 @@
20702051
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
20712052
HEADER_SEARCH_PATHS = "$(inherited)";
20722053
INFOPLIST_FILE = passKitTests/Info.plist;
2073-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2054+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20742055
LD_RUNPATH_SEARCH_PATHS = (
20752056
"$(inherited)",
20762057
"@executable_path/Frameworks",
@@ -2245,7 +2226,7 @@
22452226
HEADER_SEARCH_PATHS = "$(inherited)";
22462227
INFOPLIST_FILE = passKit/Info.plist;
22472228
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2248-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2229+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22492230
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
22502231
LIBRARY_SEARCH_PATHS = "$(inherited)";
22512232
MARKETING_VERSION = 0.12.0;
@@ -2285,7 +2266,7 @@
22852266
HEADER_SEARCH_PATHS = "$(inherited)";
22862267
INFOPLIST_FILE = passKit/Info.plist;
22872268
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2288-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2269+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22892270
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
22902271
LIBRARY_SEARCH_PATHS = "$(inherited)";
22912272
MARKETING_VERSION = 0.12.0;
@@ -2314,7 +2295,7 @@
23142295
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
23152296
HEADER_SEARCH_PATHS = "$(inherited)";
23162297
INFOPLIST_FILE = passKitTests/Info.plist;
2317-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2298+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
23182299
LD_RUNPATH_SEARCH_PATHS = (
23192300
"$(inherited)",
23202301
"@executable_path/Frameworks",
@@ -2336,7 +2317,7 @@
23362317
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
23372318
HEADER_SEARCH_PATHS = "$(inherited)";
23382319
INFOPLIST_FILE = passKitTests/Info.plist;
2339-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2320+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
23402321
LD_RUNPATH_SEARCH_PATHS = (
23412322
"$(inherited)",
23422323
"@executable_path/Frameworks",
@@ -2365,7 +2346,7 @@
23652346
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
23662347
HEADER_SEARCH_PATHS = "$(inherited)";
23672348
INFOPLIST_FILE = passExtension/Info.plist;
2368-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2349+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
23692350
LD_RUNPATH_SEARCH_PATHS = (
23702351
"$(inherited)",
23712352
"@executable_path/Frameworks",
@@ -2400,7 +2381,7 @@
24002381
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
24012382
HEADER_SEARCH_PATHS = "$(inherited)";
24022383
INFOPLIST_FILE = passExtension/Info.plist;
2403-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2384+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
24042385
LD_RUNPATH_SEARCH_PATHS = (
24052386
"$(inherited)",
24062387
"@executable_path/Frameworks",
@@ -2429,7 +2410,7 @@
24292410
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
24302411
HEADER_SEARCH_PATHS = "$(inherited)";
24312412
INFOPLIST_FILE = passTests/Info.plist;
2432-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2413+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
24332414
LD_RUNPATH_SEARCH_PATHS = (
24342415
"$(inherited)",
24352416
"@executable_path/Frameworks",
@@ -2452,7 +2433,7 @@
24522433
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
24532434
HEADER_SEARCH_PATHS = "$(inherited)";
24542435
INFOPLIST_FILE = passTests/Info.plist;
2455-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2436+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
24562437
LD_RUNPATH_SEARCH_PATHS = (
24572438
"$(inherited)",
24582439
"@executable_path/Frameworks",
@@ -2506,10 +2487,7 @@
25062487
ENABLE_ON_DEMAND_RESOURCES = NO;
25072488
ENABLE_STRICT_OBJC_MSGSEND = YES;
25082489
ENABLE_TESTABILITY = YES;
2509-
FRAMEWORK_SEARCH_PATHS = (
2510-
"$(PROJECT_DIR)/Carthage/Build/iOS",
2511-
"$(PROJECT_DIR)/go/dist",
2512-
);
2490+
FRAMEWORK_SEARCH_PATHS = "";
25132491
GCC_C_LANGUAGE_STANDARD = gnu99;
25142492
GCC_DYNAMIC_NO_PIC = NO;
25152493
GCC_NO_COMMON_BLOCKS = YES;
@@ -2524,11 +2502,8 @@
25242502
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
25252503
GCC_WARN_UNUSED_FUNCTION = YES;
25262504
GCC_WARN_UNUSED_VARIABLE = YES;
2527-
HEADER_SEARCH_PATHS = (
2528-
"$(SDKROOT)/usr/include/libxml2",
2529-
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers",
2530-
);
2531-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2505+
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
2506+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
25322507
LD_RUNPATH_SEARCH_PATHS = "";
25332508
MTL_ENABLE_DEBUG_INFO = YES;
25342509
ONLY_ACTIVE_ARCH = YES;
@@ -2583,10 +2558,7 @@
25832558
ENABLE_NS_ASSERTIONS = NO;
25842559
ENABLE_ON_DEMAND_RESOURCES = NO;
25852560
ENABLE_STRICT_OBJC_MSGSEND = YES;
2586-
FRAMEWORK_SEARCH_PATHS = (
2587-
"$(PROJECT_DIR)/Carthage/Build/iOS",
2588-
"$(PROJECT_DIR)/go/dist",
2589-
);
2561+
FRAMEWORK_SEARCH_PATHS = "";
25902562
GCC_C_LANGUAGE_STANDARD = gnu99;
25912563
GCC_NO_COMMON_BLOCKS = YES;
25922564
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2595,11 +2567,8 @@
25952567
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
25962568
GCC_WARN_UNUSED_FUNCTION = YES;
25972569
GCC_WARN_UNUSED_VARIABLE = YES;
2598-
HEADER_SEARCH_PATHS = (
2599-
"$(SDKROOT)/usr/include/libxml2",
2600-
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers",
2601-
);
2602-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2570+
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
2571+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
26032572
LD_RUNPATH_SEARCH_PATHS = "";
26042573
MTL_ENABLE_DEBUG_INFO = NO;
26052574
PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios;
@@ -2628,7 +2597,7 @@
26282597
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
26292598
HEADER_SEARCH_PATHS = "$(inherited)";
26302599
INFOPLIST_FILE = pass/Info.plist;
2631-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2600+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
26322601
LD_RUNPATH_SEARCH_PATHS = (
26332602
"$(inherited)",
26342603
"@executable_path/Frameworks",
@@ -2662,7 +2631,7 @@
26622631
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
26632632
HEADER_SEARCH_PATHS = "$(inherited)";
26642633
INFOPLIST_FILE = pass/Info.plist;
2665-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
2634+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
26662635
LD_RUNPATH_SEARCH_PATHS = (
26672636
"$(inherited)",
26682637
"@executable_path/Frameworks",
@@ -2809,6 +2778,14 @@
28092778
kind = branch;
28102779
};
28112780
};
2781+
30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */ = {
2782+
isa = XCRemoteSwiftPackageReference;
2783+
repositoryURL = "https://github.com/SimplyDanny/objective-git-swift-package";
2784+
requirement = {
2785+
branch = "0.16-passforios";
2786+
kind = branch;
2787+
};
2788+
};
28122789
9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */ = {
28132790
isa = XCRemoteSwiftPackageReference;
28142791
repositoryURL = "https://github.com/mssun/OneTimePassword";
@@ -2875,6 +2852,11 @@
28752852
package = 30A3000C26DA62F4002A734E /* XCRemoteSwiftPackageReference "Base32" */;
28762853
productName = Base32;
28772854
};
2855+
30ED1776276F8842009BA876 /* ObjectiveGit */ = {
2856+
isa = XCSwiftPackageProductDependency;
2857+
package = 30ED1775276F8842009BA876 /* XCRemoteSwiftPackageReference "objective-git-swift-package" */;
2858+
productName = ObjectiveGit;
2859+
};
28782860
9A1D1CE426E5D1CE0052028E /* OneTimePassword */ = {
28792861
isa = XCSwiftPackageProductDependency;
28802862
package = 9A1F47F826E5CF4B000C0E01 /* XCRemoteSwiftPackageReference "OneTimePassword" */;

0 commit comments

Comments
 (0)