Skip to content

Commit 2c4c980

Browse files
committed
Add depends on unzip to root, add in clean, fix signing
1 parent 5808784 commit 2c4c980

File tree

7 files changed

+21
-24
lines changed

7 files changed

+21
-24
lines changed

build.gradle.kts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import de.undercouch.gradle.tasks.download.Download
2-
import org.apache.tools.ant.taskdefs.condition.Os
32

43
plugins {
54
kotlin("multiplatform") version "1.3.70" apply false
65
id("de.undercouch.download").version("3.4.3")
6+
id("base")
77
}
88

99
buildscript {
@@ -24,19 +24,19 @@ val minSdkVersion by extra(14)
2424

2525

2626
tasks {
27-
val downloadFirebaseZipFile by creating(Download::class) {
27+
val downloadIOSFirebaseZipFile by creating(Download::class) {
2828
onlyIfModified(true)
2929
src("https://github.com/firebase/firebase-ios-sdk/releases/download/6.17.0/Firebase-6.17.0.zip")
3030
dest(File("$buildDir", "Firebase-6.17.0.zip"))
3131
overwrite(true)
3232

3333
}
3434

35-
val unzipFirebase by creating(Copy::class) {
36-
dependsOn(downloadFirebaseZipFile)
37-
from(zipTree(downloadFirebaseZipFile.dest))
35+
val unzipIOSFirebase by creating(Copy::class) {
36+
dependsOn(downloadIOSFirebaseZipFile)
37+
from(zipTree(downloadIOSFirebaseZipFile.dest))
3838
into("$buildDir")
39-
outputs.upToDateWhen { !Os.isFamily(Os.FAMILY_MAC) || Os.isFamily(Os.FAMILY_MAC) && File("$buildDir").exists() }
39+
outputs.upToDateWhen { File("$rootDir/$buildDir/Firebase").isDirectory }
4040
}
4141

4242
}
@@ -121,6 +121,9 @@ subprojects {
121121
mkdir("$buildDir/node_module")
122122
}
123123

124+
tasks.getByPath("compileKotlinIos").dependsOn(rootProject.tasks.named("unzipIOSFirebase"))
125+
tasks.getByPath("compileKotlinIosArm64").dependsOn(rootProject.tasks.named("unzipIOSFirebase"))
126+
124127
dependencies {
125128
"commonMainImplementation"(kotlin("stdlib-common"))
126129
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
@@ -136,6 +139,7 @@ subprojects {
136139
apply(plugin="maven-publish")
137140
apply(plugin="signing")
138141

142+
139143
configure<PublishingExtension> {
140144

141145
repositories {
@@ -147,7 +151,7 @@ subprojects {
147151
}
148152
}
149153
}
150-
154+
151155
publications.all {
152156
this as MavenPublication
153157

@@ -172,5 +176,6 @@ subprojects {
172176
}
173177

174178
}
179+
175180
}
176181

firebase-app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ kotlin {
8282
}
8383
}
8484

85-
configure<SigningExtension> {
85+
signing {
8686
sign(publishing.publications)
8787
}
8888

89-
tasks.getByPath("build").dependsOn(rootProject.tasks.named("unzipFirebase"))
89+
tasks.getByPath("compileKotlinIos").dependsOn(rootProject.tasks.named("unzipIOSFirebase"))
90+
tasks.getByPath("compileKotlinIosArm64").dependsOn(rootProject.tasks.named("unzipIOSFirebase"))

firebase-auth/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ kotlin {
7373
}
7474
}
7575

76-
configure<SigningExtension> {
76+
signing {
7777
sign(publishing.publications)
7878
}
79-
80-
tasks.getByPath("build").dependsOn(rootProject.tasks.named("unzipFirebase"))

firebase-common/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ kotlin {
8383
}
8484
}
8585
}
86-
87-
configure<SigningExtension> {
86+
signing {
8887
sign(publishing.publications)
8988
}
89+

firebase-database/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ kotlin {
7474
}
7575
}
7676

77-
configure<SigningExtension> {
77+
signing {
7878
sign(publishing.publications)
7979
}
8080

81-
tasks.getByPath("build").dependsOn(rootProject.tasks.named("unzipFirebase"))
82-

firebase-firestore/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ kotlin {
7474
}
7575
}
7676
}
77-
78-
configure<SigningExtension> {
77+
signing {
7978
sign(publishing.publications)
8079
}
81-
82-
tasks.getByPath("build").dependsOn(rootProject.tasks.named("unzipFirebase"))

firebase-functions/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ kotlin {
7474
}
7575
}
7676

77-
configure<SigningExtension> {
77+
signing {
7878
sign(publishing.publications)
7979
}
80-
81-
tasks.getByPath("build").dependsOn(rootProject.tasks.named("unzipFirebase"))

0 commit comments

Comments
 (0)