Skip to content

Commit fdeb13d

Browse files
charlotteliangcharlotteliang
authored
Reuse the content view from other test app in the new SwiftUI test app (#9176)
1 parent a128172 commit fdeb13d

File tree

12 files changed

+121
-174
lines changed

12 files changed

+121
-174
lines changed

‎.github/workflows/messaging.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,25 @@ jobs:
198198
run: scripts/install_prereqs.sh MessagingSample iOS
199199
- name: Build
200200
run: ([ -z $plist_secret ] || scripts/build.sh MessagingSample iOS)
201+
202+
messaging-swiftui-sample-build-test:
203+
# Don't run on private repo unless it is a PR.
204+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
205+
env:
206+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
207+
runs-on: macos-11
208+
steps:
209+
- uses: actions/checkout@v2
210+
- uses: mikehardy/buildcache-action@50738c6c77de7f34e66b870e4f8ede333b69d077
211+
with:
212+
cache_key: ${{ matrix.os }}
213+
- name: Setup Bundler
214+
run: scripts/setup_bundler.sh
215+
- name: Install Secret GoogleService-Info.plist
216+
run: |
217+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/messaging-sample-plist.gpg \
218+
FirebaseMessaging/Apps/Shared/GoogleService-Info.plist "$plist_secret"
219+
- name: Prereqs
220+
run: scripts/install_prereqs.sh SwiftUISample iOS
221+
- name: Build
222+
run: ([ -z $plist_secret ] || scripts/build.sh SwiftUISample iOS)

‎FirebaseMessaging/Apps/Sample/Sample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,10 @@
321321
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
322322
CLANG_ENABLE_MODULES = YES;
323323
CODE_SIGN_ENTITLEMENTS = Sample/Sample.entitlements;
324-
CODE_SIGN_IDENTITY = "iPhone Developer";
324+
CODE_SIGN_IDENTITY = "Apple Development";
325325
CODE_SIGN_STYLE = Manual;
326326
DEVELOPMENT_ASSET_PATHS = "\"Sample/Preview Content\"";
327-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
327+
DEVELOPMENT_TEAM = "";
328328
ENABLE_PREVIEWS = YES;
329329
INFOPLIST_FILE = Sample/Info.plist;
330330
LD_RUNPATH_SEARCH_PATHS = (
@@ -333,7 +333,7 @@
333333
);
334334
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.extensions.dev;
335335
PRODUCT_NAME = "$(TARGET_NAME)";
336-
PROVISIONING_PROFILE_SPECIFIER = "Firebase iOS App Extensions Dev";
336+
PROVISIONING_PROFILE_SPECIFIER = "";
337337
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
338338
SWIFT_VERSION = 5.0;
339339
TARGETED_DEVICE_FAMILY = "1,2";
@@ -346,10 +346,10 @@
346346
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
347347
CLANG_ENABLE_MODULES = YES;
348348
CODE_SIGN_ENTITLEMENTS = Sample/Sample.entitlements;
349-
CODE_SIGN_IDENTITY = "iPhone Developer";
349+
CODE_SIGN_IDENTITY = "Apple Development";
350350
CODE_SIGN_STYLE = Manual;
351351
DEVELOPMENT_ASSET_PATHS = "\"Sample/Preview Content\"";
352-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
352+
DEVELOPMENT_TEAM = "";
353353
ENABLE_PREVIEWS = YES;
354354
INFOPLIST_FILE = Sample/Info.plist;
355355
LD_RUNPATH_SEARCH_PATHS = (
@@ -358,7 +358,7 @@
358358
);
359359
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.extensions.dev;
360360
PRODUCT_NAME = "$(TARGET_NAME)";
361-
PROVISIONING_PROFILE_SPECIFIER = "Firebase iOS App Extensions Dev";
361+
PROVISIONING_PROFILE_SPECIFIER = "";
362362
SWIFT_VERSION = 5.0;
363363
TARGETED_DEVICE_FAMILY = "1,2";
364364
};

‎FirebaseMessaging/Apps/Shared/Identity.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,10 @@
1313
// limitations under the License.
1414

1515
import SwiftUI
16-
import FirebaseMessaging
17-
import FirebaseInstallations
1816

1917
public final class Identity: ObservableObject {
2018
// Identity that is unique per app.
2119
@Published public var installationsID: String? = nil
2220
// The token that Firebase Messaging use to send notifications.
2321
@Published public var token: String? = nil
24-
25-
init() {
26-
Installations.installations().installationID(completion: { fid, error in
27-
if let error = error as NSError? {
28-
print("Failed to get FID: ", error)
29-
return
30-
}
31-
self.installationsID = fid
32-
})
33-
}
3422
}

‎FirebaseMessaging/Apps/Shared/UserSettings.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// limitations under the License.
1414

1515
import SwiftUI
16+
import FirebaseCore
1617
import FirebaseMessaging
1718

1819
public final class UserSettings: ObservableObject {

‎FirebaseMessaging/Apps/SwiftUISample/SwiftUISample.xcodeproj/project.pbxproj

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,24 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
5104EF0A2787BC590026A7C4 /* Identity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5104EF052787BC590026A7C4 /* Identity.swift */; };
11+
5104EF0B2787BC590026A7C4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5104EF062787BC590026A7C4 /* ContentView.swift */; };
12+
5104EF0C2787BC590026A7C4 /* UserSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5104EF072787BC590026A7C4 /* UserSettings.swift */; };
13+
5104EF0E2787BC590026A7C4 /* TopicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5104EF092787BC590026A7C4 /* TopicView.swift */; };
14+
5104EF12278909060026A7C4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5104EF11278909060026A7C4 /* Assets.xcassets */; };
1015
5134F860277EAEC600AEE915 /* SwiftUISampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5134F85F277EAEC600AEE915 /* SwiftUISampleApp.swift */; };
11-
5134F862277EAEC600AEE915 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5134F861277EAEC600AEE915 /* ContentView.swift */; };
12-
5134F864277EAEC900AEE915 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5134F863277EAEC900AEE915 /* Assets.xcassets */; };
1316
5134F867277EAEC900AEE915 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5134F866277EAEC900AEE915 /* Preview Assets.xcassets */; };
1417
5134F86E277EAEF800AEE915 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5134F86D277EAEF800AEE915 /* GoogleService-Info.plist */; };
1518
/* End PBXBuildFile section */
1619

1720
/* Begin PBXFileReference section */
21+
5104EF052787BC590026A7C4 /* Identity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Identity.swift; path = ../../Shared/Identity.swift; sourceTree = "<group>"; };
22+
5104EF062787BC590026A7C4 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContentView.swift; path = ../../Shared/ContentView.swift; sourceTree = "<group>"; };
23+
5104EF072787BC590026A7C4 /* UserSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserSettings.swift; path = ../../Shared/UserSettings.swift; sourceTree = "<group>"; };
24+
5104EF092787BC590026A7C4 /* TopicView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TopicView.swift; path = ../../Shared/TopicView.swift; sourceTree = "<group>"; };
25+
5104EF11278909060026A7C4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ../../Shared/Assets.xcassets; sourceTree = "<group>"; };
1826
5134F85C277EAEC600AEE915 /* SwiftUISample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftUISample.app; sourceTree = BUILT_PRODUCTS_DIR; };
1927
5134F85F277EAEC600AEE915 /* SwiftUISampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUISampleApp.swift; sourceTree = "<group>"; };
20-
5134F861277EAEC600AEE915 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
21-
5134F863277EAEC900AEE915 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2228
5134F866277EAEC900AEE915 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2329
5134F86D277EAEF800AEE915 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../Shared/GoogleService-Info.plist"; sourceTree = "<group>"; };
2430
5134F86F277EAF0A00AEE915 /* SwiftUISample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftUISample.entitlements; sourceTree = "<group>"; };
@@ -56,12 +62,15 @@
5662
5134F85E277EAEC600AEE915 /* SwiftUISample */ = {
5763
isa = PBXGroup;
5864
children = (
65+
5104EF062787BC590026A7C4 /* ContentView.swift */,
66+
5104EF052787BC590026A7C4 /* Identity.swift */,
67+
5104EF092787BC590026A7C4 /* TopicView.swift */,
68+
5104EF072787BC590026A7C4 /* UserSettings.swift */,
5969
5134F870277EAF1600AEE915 /* Info.plist */,
6070
5134F86F277EAF0A00AEE915 /* SwiftUISample.entitlements */,
6171
5134F85F277EAEC600AEE915 /* SwiftUISampleApp.swift */,
6272
5134F86D277EAEF800AEE915 /* GoogleService-Info.plist */,
63-
5134F861277EAEC600AEE915 /* ContentView.swift */,
64-
5134F863277EAEC900AEE915 /* Assets.xcassets */,
73+
5104EF11278909060026A7C4 /* Assets.xcassets */,
6574
5134F865277EAEC900AEE915 /* Preview Content */,
6675
);
6776
path = SwiftUISample;
@@ -141,7 +150,7 @@
141150
buildActionMask = 2147483647;
142151
files = (
143152
5134F867277EAEC900AEE915 /* Preview Assets.xcassets in Resources */,
144-
5134F864277EAEC900AEE915 /* Assets.xcassets in Resources */,
153+
5104EF12278909060026A7C4 /* Assets.xcassets in Resources */,
145154
5134F86E277EAEF800AEE915 /* GoogleService-Info.plist in Resources */,
146155
);
147156
runOnlyForDeploymentPostprocessing = 0;
@@ -153,8 +162,11 @@
153162
isa = PBXSourcesBuildPhase;
154163
buildActionMask = 2147483647;
155164
files = (
156-
5134F862277EAEC600AEE915 /* ContentView.swift in Sources */,
157165
5134F860277EAEC600AEE915 /* SwiftUISampleApp.swift in Sources */,
166+
5104EF0E2787BC590026A7C4 /* TopicView.swift in Sources */,
167+
5104EF0C2787BC590026A7C4 /* UserSettings.swift in Sources */,
168+
5104EF0A2787BC590026A7C4 /* Identity.swift in Sources */,
169+
5104EF0B2787BC590026A7C4 /* ContentView.swift in Sources */,
158170
);
159171
runOnlyForDeploymentPostprocessing = 0;
160172
};
@@ -318,7 +330,7 @@
318330
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
319331
CODE_SIGN_ENTITLEMENTS = SwiftUISample/SwiftUISample.entitlements;
320332
CODE_SIGN_IDENTITY = "Apple Development";
321-
CODE_SIGN_STYLE = Manual;
333+
CODE_SIGN_STYLE = Automatic;
322334
CURRENT_PROJECT_VERSION = 1;
323335
DEVELOPMENT_ASSET_PATHS = "\"SwiftUISample/Preview Content\"";
324336
DEVELOPMENT_TEAM = "";

‎FirebaseMessaging/Apps/SwiftUISample/SwiftUISample/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎FirebaseMessaging/Apps/SwiftUISample/SwiftUISample/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎FirebaseMessaging/Apps/SwiftUISample/SwiftUISample/Assets.xcassets/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎FirebaseMessaging/Apps/SwiftUISample/SwiftUISample/ContentView.swift

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)