Skip to content

Commit 1e0f294

Browse files
authored
[Infra] Break up ClientApp based on min. supported version (#11931)
1 parent d81afaa commit 1e0f294

File tree

12 files changed

+458
-73
lines changed

12 files changed

+458
-73
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.files.user-selected.read-only</key>
8+
<true/>
9+
</dict>
10+
</plist>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.files.user-selected.read-only</key>
8+
<true/>
9+
</dict>
10+
</plist>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

ClientApp/ClientApp.xcodeproj/project.pbxproj

Lines changed: 400 additions & 38 deletions
Large diffs are not rendered by default.

ClientApp/Podfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@ source 'https://github.com/firebase/SpecsDev.git'
22
source 'https://github.com/firebase/SpecsStaging.git'
33
source 'https://cdn.cocoapods.org/'
44

5-
# Uncomment the next line to define a global platform for your project
6-
platform :ios, '13.0'
7-
85
target 'ClientApp-CocoaPods' do
9-
# Comment the next line if you don't want to use dynamic frameworks
6+
platform :ios, '11.0'
7+
108
use_frameworks!
119

12-
# Pods for ClientApp-CocoaPods
1310
pod 'FirebaseCore', :path => '../'
1411
pod 'FirebaseInstallations', :path => '../'
1512
pod 'FirebaseAnalytics' # Binary pods don't work with `:path`.
1613
pod 'FirebaseAnalyticsOnDeviceConversion', :path => '../'
17-
pod 'FirebaseAnalyticsSwift', :path => '../'
1814
pod 'FirebaseABTesting', :path => '../'
1915
pod 'FirebaseAppCheck', :path => '../'
2016
pod 'FirebaseRemoteConfig', :path => '../'
@@ -29,11 +25,21 @@ target 'ClientApp-CocoaPods' do
2925
pod 'FirebaseFirestoreSwift', :path => '../'
3026
pod 'FirebaseFunctions', :path => '../'
3127
pod 'FirebaseInAppMessaging', :path => '../'
32-
pod 'FirebaseInAppMessagingSwift', :path => '../'
3328
pod 'FirebaseMessaging', :path => '../'
3429
pod 'FirebasePerformance', :path => '../'
3530
pod 'FirebaseStorage', :path => '../'
3631
pod 'FirebaseMLModelDownloader', :path => '../'
3732
pod 'Firebase', :path => '../'
33+
end
34+
35+
target 'ClientApp-CocoaPods-iOS13' do
36+
platform :ios, '13.0'
37+
38+
use_frameworks!
39+
40+
pod 'FirebaseAnalytics' # Binary pods don't work with `:path`.
41+
pod 'FirebaseAnalyticsSwift', :path => '../' # Requires iOS 13.0+
42+
pod 'FirebaseInAppMessaging', :path => '../'
43+
pod 'FirebaseInAppMessagingSwift', :path => '../' # Requires iOS 13.0+
3844

3945
end

ClientApp/Shared/swift-import-test.swift renamed to ClientApp/Shared-iOS11+/swift-import-test.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// NOTE(ncooke3): `FirebaseABTesting` is not listed as a library.
2222
import FirebaseABTesting
2323
import FirebaseAnalytics
24-
import FirebaseAnalyticsSwift
2524
import FirebaseAppCheck
2625
#if os(iOS) && !targetEnvironment(macCatalyst)
2726
import FirebaseAppDistribution
@@ -52,7 +51,6 @@ import FirebaseMLModelDownloader
5251
#if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS)
5352
import FirebasePerformance
5453
import FirebaseInAppMessaging
55-
import FirebaseInAppMessagingSwift
5654
#endif
5755
import FirebaseRemoteConfig
5856
import FirebaseRemoteConfigSwift

0 commit comments

Comments
 (0)