Skip to content

Commit 164421e

Browse files
russellwheatleyLyokone
russellwheatley
authored and
Lyokone
committed
feat(remote_config): Swift Package Manager support (#16772)
1 parent dc0dee2 commit 164421e

File tree

29 files changed

+389
-181
lines changed

29 files changed

+389
-181
lines changed

‎.github/workflows/scripts/swift-integration.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ void main() async {
1010
await buildSwiftExampleApp('ios', 'cloud_firestore');
1111
await buildSwiftExampleApp('macos', 'firebase_core');
1212
await buildSwiftExampleApp('macos', 'cloud_firestore');
13+
await buildSwiftExampleApp('ios', 'firebase_remote_config');
14+
await buildSwiftExampleApp('macos', 'firebase_remote_config');
1315
await buildSwiftExampleApp('ios', 'cloud_functions');
1416
await buildSwiftExampleApp('macos', 'cloud_functions');
1517
}
@@ -46,7 +48,7 @@ Future<void> buildSwiftExampleApp(String platform, String plugin) async {
4648

4749
if (platform == 'macos') {
4850
await deleteFirstLine(
49-
'packages/$plugin/$plugin/example/macos/Flutter/Flutter-Debug.xcconfig');
51+
'packages/$plugin/$plugin/example/macos/Flutter/Flutter-Release.xcconfig');
5052
}
5153
// Change to the appropriate directory
5254
Directory.current = directory;

‎packages/firebase_remote_config/firebase_remote_config/example/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

‎packages/firebase_remote_config/firebase_remote_config/example/ios/Flutter/Debug.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
22
#include "Generated.xcconfig"

‎packages/firebase_remote_config/firebase_remote_config/example/ios/Flutter/Release.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
22
#include "Generated.xcconfig"

‎packages/firebase_remote_config/firebase_remote_config/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
3727B1F241E6C1CC3918268E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D61E2AA0A4F0CAD8AC14E90 /* Pods_Runner.framework */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
7633732D245146D3E8D89BAC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96648553A35D8487B2A4CA10 /* GoogleService-Info.plist */; };
1314
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
@@ -17,7 +18,7 @@
1718
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1819
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1920
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
20-
F9922BB7FAC6B5F18E0D7EBC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8A9F141EBA58EA62CE0E76 /* Pods_Runner.framework */; };
21+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
2122
/* End PBXBuildFile section */
2223

2324
/* Begin PBXCopyFilesBuildPhase section */
@@ -36,13 +37,12 @@
3637
/* Begin PBXFileReference section */
3738
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3839
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
39-
17E97D121885EC16AACB80C0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4040
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
41-
6AC60063471A92E2CD943EC3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
41+
4D61E2AA0A4F0CAD8AC14E90 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
42+
5877CA425A3244F1F5D2A97A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4243
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4344
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4445
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
45-
8A8A9F141EBA58EA62CE0E76 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4646
96648553A35D8487B2A4CA10 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
4747
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4848
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -52,28 +52,40 @@
5252
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5353
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5454
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
55+
BDB0B468AA7D8CAD6C211602 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
5556
/* End PBXFileReference section */
5657

5758
/* Begin PBXFrameworksBuildPhase section */
5859
97C146EB1CF9000F007C117D /* Frameworks */ = {
5960
isa = PBXFrameworksBuildPhase;
6061
buildActionMask = 2147483647;
6162
files = (
62-
F9922BB7FAC6B5F18E0D7EBC /* Pods_Runner.framework in Frameworks */,
63+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
64+
3727B1F241E6C1CC3918268E /* Pods_Runner.framework in Frameworks */,
6365
);
6466
runOnlyForDeploymentPostprocessing = 0;
6567
};
6668
/* End PBXFrameworksBuildPhase section */
6769

6870
/* Begin PBXGroup section */
69-
23DAF82DF3F4525BB2F90DDE /* Frameworks */ = {
71+
18A23727156B71DF2EBC4BBF /* Frameworks */ = {
7072
isa = PBXGroup;
7173
children = (
72-
8A8A9F141EBA58EA62CE0E76 /* Pods_Runner.framework */,
74+
4D61E2AA0A4F0CAD8AC14E90 /* Pods_Runner.framework */,
7375
);
7476
name = Frameworks;
7577
sourceTree = "<group>";
7678
};
79+
657DD3F2D5A59EA96D647065 /* Pods */ = {
80+
isa = PBXGroup;
81+
children = (
82+
BDB0B468AA7D8CAD6C211602 /* Pods-Runner.debug.xcconfig */,
83+
5877CA425A3244F1F5D2A97A /* Pods-Runner.release.xcconfig */,
84+
);
85+
name = Pods;
86+
path = Pods;
87+
sourceTree = "<group>";
88+
};
7789
9740EEB11CF90186004384FC /* Flutter */ = {
7890
isa = PBXGroup;
7991
children = (
@@ -91,9 +103,9 @@
91103
9740EEB11CF90186004384FC /* Flutter */,
92104
97C146F01CF9000F007C117D /* Runner */,
93105
97C146EF1CF9000F007C117D /* Products */,
94-
DC0A69E1FF6565F85D3F7801 /* Pods */,
95-
23DAF82DF3F4525BB2F90DDE /* Frameworks */,
96106
96648553A35D8487B2A4CA10 /* GoogleService-Info.plist */,
107+
657DD3F2D5A59EA96D647065 /* Pods */,
108+
18A23727156B71DF2EBC4BBF /* Frameworks */,
97109
);
98110
sourceTree = "<group>";
99111
};
@@ -129,30 +141,23 @@
129141
name = "Supporting Files";
130142
sourceTree = "<group>";
131143
};
132-
DC0A69E1FF6565F85D3F7801 /* Pods */ = {
133-
isa = PBXGroup;
134-
children = (
135-
6AC60063471A92E2CD943EC3 /* Pods-Runner.debug.xcconfig */,
136-
17E97D121885EC16AACB80C0 /* Pods-Runner.release.xcconfig */,
137-
);
138-
name = Pods;
139-
sourceTree = "<group>";
140-
};
141144
/* End PBXGroup section */
142145

143146
/* Begin PBXNativeTarget section */
144147
97C146ED1CF9000F007C117D /* Runner */ = {
148+
packageProductDependencies = (
149+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
150+
);
145151
isa = PBXNativeTarget;
146152
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
147153
buildPhases = (
148-
8F3B99257FEBEE68D8CDFD61 /* [CP] Check Pods Manifest.lock */,
154+
77F626D5D401DBC3550E44D8 /* [CP] Check Pods Manifest.lock */,
149155
9740EEB61CF901F6004384FC /* Run Script */,
150156
97C146EA1CF9000F007C117D /* Sources */,
151157
97C146EB1CF9000F007C117D /* Frameworks */,
152158
97C146EC1CF9000F007C117D /* Resources */,
153159
9705A1C41CF9048500538489 /* Embed Frameworks */,
154160
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
155-
AB066FC83FEE088CB7E33EA5 /* [CP] Embed Pods Frameworks */,
156161
);
157162
buildRules = (
158163
);
@@ -167,6 +172,9 @@
167172

168173
/* Begin PBXProject section */
169174
97C146E61CF9000F007C117D /* Project object */ = {
175+
packageReferences = (
176+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
177+
);
170178
isa = PBXProject;
171179
attributes = {
172180
LastUpgradeCheck = 1510;
@@ -230,16 +238,20 @@
230238
shellPath = /bin/sh;
231239
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
232240
};
233-
8F3B99257FEBEE68D8CDFD61 /* [CP] Check Pods Manifest.lock */ = {
241+
77F626D5D401DBC3550E44D8 /* [CP] Check Pods Manifest.lock */ = {
234242
isa = PBXShellScriptBuildPhase;
235243
buildActionMask = 2147483647;
236244
files = (
237245
);
246+
inputFileListPaths = (
247+
);
238248
inputPaths = (
239249
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
240250
"${PODS_ROOT}/Manifest.lock",
241251
);
242252
name = "[CP] Check Pods Manifest.lock";
253+
outputFileListPaths = (
254+
);
243255
outputPaths = (
244256
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
245257
);
@@ -263,38 +275,6 @@
263275
shellPath = /bin/sh;
264276
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
265277
};
266-
AB066FC83FEE088CB7E33EA5 /* [CP] Embed Pods Frameworks */ = {
267-
isa = PBXShellScriptBuildPhase;
268-
buildActionMask = 2147483647;
269-
files = (
270-
);
271-
inputPaths = (
272-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
273-
"${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework",
274-
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
275-
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
276-
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
277-
"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
278-
"${BUILT_PRODUCTS_DIR}/FirebaseSharedSwift/FirebaseSharedSwift.framework",
279-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
280-
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
281-
);
282-
name = "[CP] Embed Pods Frameworks";
283-
outputPaths = (
284-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework",
285-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
286-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
287-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
288-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
289-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSharedSwift.framework",
290-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
292-
);
293-
runOnlyForDeploymentPostprocessing = 0;
294-
shellPath = /bin/sh;
295-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
296-
showEnvVarsInLog = 0;
297-
};
298278
/* End PBXShellScriptBuildPhase section */
299279

300280
/* Begin PBXSourcesBuildPhase section */
@@ -502,6 +482,18 @@
502482
defaultConfigurationName = Release;
503483
};
504484
/* End XCConfigurationList section */
485+
/* Begin XCLocalSwiftPackageReference section */
486+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
487+
isa = XCLocalSwiftPackageReference;
488+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
489+
};
490+
/* End XCLocalSwiftPackageReference section */
491+
/* Begin XCSwiftPackageProductDependency section */
492+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
493+
isa = XCSwiftPackageProductDependency;
494+
productName = FlutterGeneratedPluginSwiftPackage;
495+
};
496+
/* End XCSwiftPackageProductDependency section */
505497
};
506498
rootObject = 97C146E61CF9000F007C117D /* Project object */;
507499
}

‎packages/firebase_remote_config/firebase_remote_config/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18+
BuildableName = "Runner.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"

0 commit comments

Comments
 (0)