Skip to content

Commit 7c498b9

Browse files
morganchen12morganchen12
authored
add pipeline snippets and update project for Swift 6 (#409)
* add pipeline snippets and update project for Swift 6 * fix typo in name * fix another typo
1 parent 6276261 commit 7c498b9

File tree

6 files changed

+1555
-27
lines changed

6 files changed

+1555
-27
lines changed

‎firestore/swift/firestore-smoketest.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -17,9 +17,12 @@
1717
3EABFB2D1E254C8F00F4BBED /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3EABFB2B1E254C8F00F4BBED /* LaunchScreen.storyboard */; };
1818
3EABFB381E254C8F00F4BBED /* firestore_smoketestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EABFB371E254C8F00F4BBED /* firestore_smoketestTests.swift */; };
1919
3EABFB431E254C8F00F4BBED /* firestore_smoketestUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EABFB421E254C8F00F4BBED /* firestore_smoketestUITests.swift */; };
20+
8D15627E2EA0474400D3B017 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D15627D2EA0474400D3B017 /* FirebaseAuth */; };
21+
8D1562802EA0474400D3B017 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D15627F2EA0474400D3B017 /* FirebaseFirestore */; };
2022
8D7951A32D28AC82000FD694 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951A22D28AC82000FD694 /* FirebaseAuth */; };
2123
8D7951A52D28AC82000FD694 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951A42D28AC82000FD694 /* FirebaseFirestore */; };
2224
8D7951A82D28ADBE000FD694 /* GeoFireUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951A72D28ADBE000FD694 /* GeoFireUtils */; };
25+
8D7C36932EA069B70083BAF5 /* PipelineSnippets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D7C36922EA069B00083BAF5 /* PipelineSnippets.swift */; };
2326
8D864B17260D3947008E85B3 /* SolutionBundles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D864B16260D3947008E85B3 /* SolutionBundles.swift */; };
2427
8D864B35260D55C1008E85B3 /* SolutionGeoPointViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFC116F258A2B8E00D080CB /* SolutionGeoPointViewController.swift */; };
2528
8DA9B4AB201165C800EC29CD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8DA9B4AA201165C800EC29CD /* GoogleService-Info.plist */; };
@@ -59,6 +62,7 @@
5962
3EABFB3E1E254C8F00F4BBED /* firestore-smoketestUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "firestore-smoketestUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
6063
3EABFB421E254C8F00F4BBED /* firestore_smoketestUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = firestore_smoketestUITests.swift; sourceTree = "<group>"; };
6164
3EABFB441E254C8F00F4BBED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
65+
8D7C36922EA069B00083BAF5 /* PipelineSnippets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PipelineSnippets.swift; sourceTree = "<group>"; };
6266
8D864B16260D3947008E85B3 /* SolutionBundles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolutionBundles.swift; sourceTree = "<group>"; };
6367
8DA9B4AA201165C800EC29CD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
6468
8DFC116F258A2B8E00D080CB /* SolutionGeoPointViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolutionGeoPointViewController.swift; sourceTree = "<group>"; };
@@ -72,6 +76,8 @@
7276
8D7951A32D28AC82000FD694 /* FirebaseAuth in Frameworks */,
7377
8D7951A82D28ADBE000FD694 /* GeoFireUtils in Frameworks */,
7478
8D7951A52D28AC82000FD694 /* FirebaseFirestore in Frameworks */,
79+
8D1562802EA0474400D3B017 /* FirebaseFirestore in Frameworks */,
80+
8D15627E2EA0474400D3B017 /* FirebaseAuth in Frameworks */,
7581
);
7682
runOnlyForDeploymentPostprocessing = 0;
7783
};
@@ -116,6 +122,7 @@
116122
3EABFB211E254C8F00F4BBED /* firestore-smoketest */ = {
117123
isa = PBXGroup;
118124
children = (
125+
8D7C36922EA069B00083BAF5 /* PipelineSnippets.swift */,
119126
8DA9B4AA201165C800EC29CD /* GoogleService-Info.plist */,
120127
3EABFB221E254C8F00F4BBED /* AppDelegate.swift */,
121128
3EABFB241E254C8F00F4BBED /* ViewController.swift */,
@@ -253,8 +260,8 @@
253260
);
254261
mainGroup = 3EABFB161E254C8E00F4BBED;
255262
packageReferences = (
256-
8D7951A02D28AC75000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
257263
8D7951A62D28ADAE000FD694 /* XCRemoteSwiftPackageReference "geofire-objc" */,
264+
8D15627C2EA0474400D3B017 /* XCLocalSwiftPackageReference "../../../firebase-ios-sdk" */,
258265
);
259266
productRefGroup = 3EABFB201E254C8F00F4BBED /* Products */;
260267
projectDirPath = "";
@@ -305,6 +312,7 @@
305312
8D864B17260D3947008E85B3 /* SolutionBundles.swift in Sources */,
306313
3E3694B71EFDB3BF009C9125 /* SolutionAggregationViewController.swift in Sources */,
307314
8D864B35260D55C1008E85B3 /* SolutionGeoPointViewController.swift in Sources */,
315+
8D7C36932EA069B70083BAF5 /* PipelineSnippets.swift in Sources */,
308316
3EABFB231E254C8F00F4BBED /* AppDelegate.swift in Sources */,
309317
3E3694B91EFDC039009C9125 /* SolutionCountersViewController.swift in Sources */,
310318
);
@@ -412,12 +420,13 @@
412420
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
413421
GCC_WARN_UNUSED_FUNCTION = YES;
414422
GCC_WARN_UNUSED_VARIABLE = YES;
415-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
423+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
416424
MTL_ENABLE_DEBUG_INFO = YES;
417425
ONLY_ACTIVE_ARCH = YES;
418426
SDKROOT = iphoneos;
419427
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
420428
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
429+
SWIFT_VERSION = 6.0;
421430
TARGETED_DEVICE_FAMILY = "1,2";
422431
};
423432
name = Debug;
@@ -467,11 +476,12 @@
467476
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
468477
GCC_WARN_UNUSED_FUNCTION = YES;
469478
GCC_WARN_UNUSED_VARIABLE = YES;
470-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
479+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
471480
MTL_ENABLE_DEBUG_INFO = NO;
472481
SDKROOT = iphoneos;
473482
SWIFT_COMPILATION_MODE = wholemodule;
474483
SWIFT_OPTIMIZATION_LEVEL = "-O";
484+
SWIFT_VERSION = 6.0;
475485
TARGETED_DEVICE_FAMILY = "1,2";
476486
VALIDATE_PRODUCT = YES;
477487
};
@@ -483,14 +493,14 @@
483493
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
484494
"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = YES;
485495
INFOPLIST_FILE = "firestore-smoketest/Info.plist";
486-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
496+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
487497
LD_RUNPATH_SEARCH_PATHS = (
488498
"$(inherited)",
489499
"@executable_path/Frameworks",
490500
);
491501
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.firestore-smoketest";
492502
PRODUCT_NAME = "$(TARGET_NAME)";
493-
SWIFT_VERSION = 4.0;
503+
SWIFT_VERSION = 6.0;
494504
TARGETED_DEVICE_FAMILY = 1;
495505
};
496506
name = Debug;
@@ -501,14 +511,14 @@
501511
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
502512
"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = YES;
503513
INFOPLIST_FILE = "firestore-smoketest/Info.plist";
504-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
514+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
505515
LD_RUNPATH_SEARCH_PATHS = (
506516
"$(inherited)",
507517
"@executable_path/Frameworks",
508518
);
509519
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.firestore-smoketest";
510520
PRODUCT_NAME = "$(TARGET_NAME)";
511-
SWIFT_VERSION = 4.0;
521+
SWIFT_VERSION = 6.0;
512522
TARGETED_DEVICE_FAMILY = 1;
513523
};
514524
name = Release;
@@ -620,10 +630,17 @@
620630
};
621631
/* End XCConfigurationList section */
622632

633+
/* Begin XCLocalSwiftPackageReference section */
634+
8D15627C2EA0474400D3B017 /* XCLocalSwiftPackageReference "../../../firebase-ios-sdk" */ = {
635+
isa = XCLocalSwiftPackageReference;
636+
relativePath = "../../../firebase-ios-sdk";
637+
};
638+
/* End XCLocalSwiftPackageReference section */
639+
623640
/* Begin XCRemoteSwiftPackageReference section */
624641
8D7951A02D28AC75000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
625642
isa = XCRemoteSwiftPackageReference;
626-
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
643+
repositoryURL = "~/dev/firebase-ios-sdk";
627644
requirement = {
628645
kind = upToNextMajorVersion;
629646
minimumVersion = 11.6.0;
@@ -640,6 +657,14 @@
640657
/* End XCRemoteSwiftPackageReference section */
641658

642659
/* Begin XCSwiftPackageProductDependency section */
660+
8D15627D2EA0474400D3B017 /* FirebaseAuth */ = {
661+
isa = XCSwiftPackageProductDependency;
662+
productName = FirebaseAuth;
663+
};
664+
8D15627F2EA0474400D3B017 /* FirebaseFirestore */ = {
665+
isa = XCSwiftPackageProductDependency;
666+
productName = FirebaseFirestore;
667+
};
643668
8D7951A22D28AC82000FD694 /* FirebaseAuth */ = {
644669
isa = XCSwiftPackageProductDependency;
645670
package = 8D7951A02D28AC75000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;

‎firestore/swift/firestore-smoketest.xcodeproj/xcshareddata/xcschemes/firestore-smoketest.xcscheme‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1620"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "3EABFB1E1E254C8E00F4BBED"
19+
BuildableName = "firestore-smoketest.app"
20+
BlueprintName = "firestore-smoketest"
21+
ReferencedContainer = "container:firestore-smoketest.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "3EABFB321E254C8F00F4BBED"
38+
BuildableName = "firestore-smoketestTests.xctest"
39+
BlueprintName = "firestore-smoketestTests"
40+
ReferencedContainer = "container:firestore-smoketest.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
<TestableReference
44+
skipped = "NO">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "3EABFB3D1E254C8F00F4BBED"
48+
BuildableName = "firestore-smoketestUITests.xctest"
49+
BlueprintName = "firestore-smoketestUITests"
50+
ReferencedContainer = "container:firestore-smoketest.xcodeproj">
51+
</BuildableReference>
52+
</TestableReference>
53+
</Testables>
54+
</TestAction>
55+
<LaunchAction
56+
buildConfiguration = "Debug"
57+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
58+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
launchStyle = "0"
60+
useCustomWorkingDirectory = "NO"
61+
ignoresPersistentStateOnLaunch = "NO"
62+
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
64+
allowLocationSimulation = "YES">
65+
<BuildableProductRunnable
66+
runnableDebuggingMode = "0">
67+
<BuildableReference
68+
BuildableIdentifier = "primary"
69+
BlueprintIdentifier = "3EABFB1E1E254C8E00F4BBED"
70+
BuildableName = "firestore-smoketest.app"
71+
BlueprintName = "firestore-smoketest"
72+
ReferencedContainer = "container:firestore-smoketest.xcodeproj">
73+
</BuildableReference>
74+
</BuildableProductRunnable>
75+
<EnvironmentVariables>
76+
<EnvironmentVariable
77+
key = "FIREBASE_SOURCE_FIRESTORE"
78+
value = "1"
79+
isEnabled = "YES">
80+
</EnvironmentVariable>
81+
</EnvironmentVariables>
82+
</LaunchAction>
83+
<ProfileAction
84+
buildConfiguration = "Release"
85+
shouldUseLaunchSchemeArgsEnv = "YES"
86+
savedToolIdentifier = ""
87+
useCustomWorkingDirectory = "NO"
88+
debugDocumentVersioning = "YES">
89+
<BuildableProductRunnable
90+
runnableDebuggingMode = "0">
91+
<BuildableReference
92+
BuildableIdentifier = "primary"
93+
BlueprintIdentifier = "3EABFB1E1E254C8E00F4BBED"
94+
BuildableName = "firestore-smoketest.app"
95+
BlueprintName = "firestore-smoketest"
96+
ReferencedContainer = "container:firestore-smoketest.xcodeproj">
97+
</BuildableReference>
98+
</BuildableProductRunnable>
99+
</ProfileAction>
100+
<AnalyzeAction
101+
buildConfiguration = "Debug">
102+
</AnalyzeAction>
103+
<ArchiveAction
104+
buildConfiguration = "Release"
105+
revealArchiveInOrganizer = "YES">
106+
</ArchiveAction>
107+
</Scheme>

‎firestore/swift/firestore-smoketest/AppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ import UIKit
1919
import FirebaseCore
2020
import FirebaseFirestore
2121

22-
@UIApplicationMain
22+
@main
2323
class AppDelegate: UIResponder, UIApplicationDelegate {
2424

2525
var window: UIWindow?
2626

2727

28-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
28+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
2929

3030
// [START default_firestore]
3131
FirebaseApp.configure()

0 commit comments

Comments
 (0)