Skip to content

Commit f76978b

Browse files
ReedyukReedyuk
committed
Added properties to skip iostarget and skip ios tests.
1 parent 6ac7a83 commit f76978b

File tree

8 files changed

+326
-258
lines changed

8 files changed

+326
-258
lines changed

‎firebase-app/build.gradle.kts

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -57,42 +57,48 @@ kotlin {
5757
publishAllLibraryVariants()
5858
}
5959

60-
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
61-
val nativeFrameworkPaths = listOf(
62-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
63-
).plus(
64-
listOf(
65-
"FirebaseAnalytics",
66-
"FirebaseCore",
67-
"FirebaseCoreDiagnostics",
68-
"FirebaseInstallations",
69-
"GoogleAppMeasurement",
70-
"GoogleDataTransport",
71-
"GoogleUtilities",
72-
"nanopb",
73-
"PromisesObjC"
74-
).map {
75-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
76-
}
77-
)
60+
val supportIosTarget = project.property("skipIosTarget") != "true"
61+
val runIosTests = project.property("skipIosTests") != "true"
62+
63+
if (supportIosTarget) {
64+
65+
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
66+
val nativeFrameworkPaths = listOf(
67+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
68+
).plus(
69+
listOf(
70+
"FirebaseAnalytics",
71+
"FirebaseCore",
72+
"FirebaseCoreDiagnostics",
73+
"FirebaseInstallations",
74+
"GoogleAppMeasurement",
75+
"GoogleDataTransport",
76+
"GoogleUtilities",
77+
"nanopb",
78+
"PromisesObjC"
79+
).map {
80+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
81+
}
82+
)
7883

79-
binaries {
80-
getTest("DEBUG").apply {
81-
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
82-
linkerOpts("-ObjC")
84+
binaries {
85+
getTest("DEBUG").apply {
86+
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
87+
linkerOpts("-ObjC")
88+
}
8389
}
84-
}
8590

86-
compilations.getByName("main") {
87-
cinterops.create("FirebaseCore") {
88-
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
89-
extraOpts("-verbose")
91+
compilations.getByName("main") {
92+
cinterops.create("FirebaseCore") {
93+
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
94+
extraOpts("-verbose")
95+
}
9096
}
9197
}
92-
}
9398

94-
ios(configure = nativeTargetConfig())
95-
iosSimulatorArm64(configure = nativeTargetConfig())
99+
ios(configure = nativeTargetConfig())
100+
iosSimulatorArm64(configure = nativeTargetConfig())
101+
}
96102

97103
js {
98104
useCommonJs()
@@ -133,13 +139,17 @@ kotlin {
133139
}
134140
}
135141

136-
val iosMain by getting
137-
val iosSimulatorArm64Main by getting
138-
iosSimulatorArm64Main.dependsOn(iosMain)
142+
if (supportIosTarget) {
143+
val iosMain by getting
144+
val iosSimulatorArm64Main by getting
145+
iosSimulatorArm64Main.dependsOn(iosMain)
139146

140-
val iosTest by sourceSets.getting
141-
val iosSimulatorArm64Test by sourceSets.getting
142-
iosSimulatorArm64Test.dependsOn(iosTest)
147+
if (runIosTests) {
148+
val iosTest by sourceSets.getting
149+
val iosSimulatorArm64Test by sourceSets.getting
150+
iosSimulatorArm64Test.dependsOn(iosTest)
151+
}
152+
}
143153

144154
val jsMain by getting
145155
}

‎firebase-auth/build.gradle.kts

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -80,49 +80,55 @@ kotlin {
8080
publishAllLibraryVariants()
8181
}
8282

83-
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
84-
val nativeFrameworkPaths = listOf(
85-
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
86-
).plus(
87-
listOf(
88-
"FirebaseAnalytics",
89-
"FirebaseCore",
90-
"FirebaseCoreDiagnostics",
91-
"FirebaseInstallations",
92-
"GoogleAppMeasurement",
93-
"GoogleDataTransport",
94-
"GoogleUtilities",
95-
"nanopb",
96-
"PromisesObjC"
97-
).map {
98-
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
99-
}
100-
).plus(
101-
listOf(
102-
"FirebaseAuth",
103-
"GTMSessionFetcher"
104-
).map {
105-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
106-
}
107-
)
83+
val supportIosTarget = project.property("skipIosTarget") != "true"
84+
val runIosTests = project.property("skipIosTests") != "true"
85+
86+
if (supportIosTarget) {
87+
88+
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
89+
val nativeFrameworkPaths = listOf(
90+
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
91+
).plus(
92+
listOf(
93+
"FirebaseAnalytics",
94+
"FirebaseCore",
95+
"FirebaseCoreDiagnostics",
96+
"FirebaseInstallations",
97+
"GoogleAppMeasurement",
98+
"GoogleDataTransport",
99+
"GoogleUtilities",
100+
"nanopb",
101+
"PromisesObjC"
102+
).map {
103+
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
104+
}
105+
).plus(
106+
listOf(
107+
"FirebaseAuth",
108+
"GTMSessionFetcher"
109+
).map {
110+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
111+
}
112+
)
108113

109-
binaries {
110-
getTest("DEBUG").apply {
111-
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
112-
linkerOpts("-ObjC")
114+
binaries {
115+
getTest("DEBUG").apply {
116+
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
117+
linkerOpts("-ObjC")
118+
}
113119
}
114-
}
115120

116-
compilations.getByName("main") {
117-
cinterops.create("FirebaseAuth") {
118-
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
119-
extraOpts("-verbose")
121+
compilations.getByName("main") {
122+
cinterops.create("FirebaseAuth") {
123+
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
124+
extraOpts("-verbose")
125+
}
120126
}
121127
}
122-
}
123128

124-
ios(configure = nativeTargetConfig())
125-
iosSimulatorArm64(configure = nativeTargetConfig())
129+
ios(configure = nativeTargetConfig())
130+
iosSimulatorArm64(configure = nativeTargetConfig())
131+
}
126132

127133
js {
128134
useCommonJs()
@@ -165,13 +171,17 @@ kotlin {
165171
}
166172
}
167173

168-
val iosMain by getting
169-
val iosSimulatorArm64Main by getting
170-
iosSimulatorArm64Main.dependsOn(iosMain)
174+
if (supportIosTarget) {
175+
val iosMain by getting
176+
val iosSimulatorArm64Main by getting
177+
iosSimulatorArm64Main.dependsOn(iosMain)
171178

172-
val iosTest by sourceSets.getting
173-
val iosSimulatorArm64Test by sourceSets.getting
174-
iosSimulatorArm64Test.dependsOn(iosTest)
179+
if (runIosTests) {
180+
val iosTest by sourceSets.getting
181+
val iosSimulatorArm64Test by sourceSets.getting
182+
iosSimulatorArm64Test.dependsOn(iosTest)
183+
}
184+
}
175185

176186
val jsMain by getting
177187
}

‎firebase-common/build.gradle.kts

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,13 @@ kotlin {
4646
publishAllLibraryVariants()
4747
}
4848

49-
ios()
50-
iosSimulatorArm64()
49+
val supportIosTarget = project.property("skipIosTarget") != "true"
50+
val runIosTests = project.property("skipIosTests") != "true"
51+
52+
if (supportIosTarget) {
53+
ios()
54+
iosSimulatorArm64()
55+
}
5156

5257
js {
5358
useCommonJs()
@@ -92,13 +97,17 @@ kotlin {
9297
}
9398
}
9499

95-
val iosMain by getting
96-
val iosSimulatorArm64Main by getting
97-
iosSimulatorArm64Main.dependsOn(iosMain)
100+
if (supportIosTarget) {
101+
val iosMain by getting
102+
val iosSimulatorArm64Main by getting
103+
iosSimulatorArm64Main.dependsOn(iosMain)
98104

99-
val iosTest by sourceSets.getting
100-
val iosSimulatorArm64Test by sourceSets.getting
101-
iosSimulatorArm64Test.dependsOn(iosTest)
105+
if (runIosTests) {
106+
val iosTest by sourceSets.getting
107+
val iosSimulatorArm64Test by sourceSets.getting
108+
iosSimulatorArm64Test.dependsOn(iosTest)
109+
}
110+
}
102111

103112
val jsMain by getting {
104113
dependencies {

‎firebase-config/build.gradle.kts

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -69,45 +69,50 @@ kotlin {
6969
publishAllLibraryVariants()
7070
}
7171

72-
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
73-
val nativeFrameworkPaths = listOf(
74-
"FirebaseCore",
75-
"FirebaseCoreDiagnostics",
76-
"FirebaseAnalytics",
77-
"GoogleAppMeasurement",
78-
"FirebaseInstallations",
79-
"GoogleDataTransport",
80-
"GoogleUtilities",
81-
"PromisesObjC",
82-
"nanopb"
83-
).map {
84-
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
85-
}.plus(
86-
listOf(
87-
"FirebaseABTesting",
88-
"FirebaseRemoteConfig"
72+
val supportIosTarget = project.property("skipIosTarget") != "true"
73+
val runIosTests = project.property("skipIosTests") != "true"
74+
75+
if (supportIosTarget) {
76+
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
77+
val nativeFrameworkPaths = listOf(
78+
"FirebaseCore",
79+
"FirebaseCoreDiagnostics",
80+
"FirebaseAnalytics",
81+
"GoogleAppMeasurement",
82+
"FirebaseInstallations",
83+
"GoogleDataTransport",
84+
"GoogleUtilities",
85+
"PromisesObjC",
86+
"nanopb"
8987
).map {
90-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
91-
}
92-
)
88+
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
89+
}.plus(
90+
listOf(
91+
"FirebaseABTesting",
92+
"FirebaseRemoteConfig"
93+
).map {
94+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
95+
}
96+
)
9397

94-
binaries {
95-
getTest("DEBUG").apply {
96-
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
97-
linkerOpts("-ObjC")
98+
binaries {
99+
getTest("DEBUG").apply {
100+
linkerOpts(nativeFrameworkPaths.map { "-F$it" })
101+
linkerOpts("-ObjC")
102+
}
98103
}
99-
}
100104

101-
compilations.getByName("main") {
102-
cinterops.create("FirebaseRemoteConfig") {
103-
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
104-
extraOpts("-verbose")
105+
compilations.getByName("main") {
106+
cinterops.create("FirebaseRemoteConfig") {
107+
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
108+
extraOpts("-verbose")
109+
}
105110
}
106111
}
107-
}
108112

109-
ios(configure = nativeTargetConfig())
110-
iosSimulatorArm64(configure = nativeTargetConfig())
113+
ios(configure = nativeTargetConfig())
114+
iosSimulatorArm64(configure = nativeTargetConfig())
115+
}
111116

112117
js {
113118
useCommonJs()
@@ -143,13 +148,17 @@ kotlin {
143148
}
144149
}
145150

146-
val iosMain by getting
147-
val iosSimulatorArm64Main by getting
148-
iosSimulatorArm64Main.dependsOn(iosMain)
151+
if (supportIosTarget) {
152+
val iosMain by getting
153+
val iosSimulatorArm64Main by getting
154+
iosSimulatorArm64Main.dependsOn(iosMain)
149155

150-
val iosTest by sourceSets.getting
151-
val iosSimulatorArm64Test by sourceSets.getting
152-
iosSimulatorArm64Test.dependsOn(iosTest)
156+
if (runIosTests) {
157+
val iosTest by sourceSets.getting
158+
val iosSimulatorArm64Test by sourceSets.getting
159+
iosSimulatorArm64Test.dependsOn(iosTest)
160+
}
161+
}
153162

154163
val jsMain by getting
155164
}

0 commit comments

Comments
 (0)