Skip to content

Commit 606e09b

Browse files
DatL4gDatL4g
committed
update some build scripts
1 parent b02afce commit 606e09b

File tree

17 files changed

+167
-268
lines changed

17 files changed

+167
-268
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import java.io.InputStream
1111

1212
plugins {
1313
alias(libs.plugins.android.application) apply false
14+
alias(libs.plugins.android.library) apply false
1415
alias(libs.plugins.kotlinx.serialization) apply false
1516
alias(libs.plugins.multiplatform) apply false
1617
alias(libs.plugins.native.cocoapods) apply false

‎firebase-analytics/build.gradle.kts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-analytics.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("native.cocoapods")
15-
kotlin("multiplatform")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.native.cocoapods)
15+
alias(libs.plugins.multiplatform)
1616
id("testOptionsConvention")
1717
}
1818

@@ -122,23 +122,16 @@ kotlin {
122122
}
123123
}
124124

125-
getByName("commonMain") {
126-
dependencies {
127-
api(project(":firebase-app"))
128-
implementation(project(":firebase-common"))
129-
}
125+
commonMain.dependencies {
126+
api(project(":firebase-app"))
127+
implementation(project(":firebase-common"))
130128
}
131-
132-
getByName("commonTest") {
133-
dependencies {
134-
implementation(project(":test-utils"))
135-
}
129+
commonTest.dependencies {
130+
implementation(project(":test-utils"))
136131
}
137132

138-
getByName("androidMain") {
139-
dependencies {
140-
api(libs.google.firebase.analytics)
141-
}
133+
androidMain.dependencies {
134+
api(libs.google.firebase.analytics)
142135
}
143136
}
144137
}

‎firebase-app/build.gradle.kts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-app.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("native.cocoapods")
15-
kotlin("multiplatform")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.native.cocoapods)
15+
alias(libs.plugins.multiplatform)
1616
id("testOptionsConvention")
1717
}
1818

@@ -124,25 +124,18 @@ kotlin {
124124
}
125125
}
126126

127-
getByName("commonMain") {
128-
dependencies {
129-
implementation(project(":firebase-common"))
130-
}
127+
commonMain.dependencies {
128+
implementation(project(":firebase-common"))
131129
}
132-
133-
getByName("commonTest") {
134-
dependencies {
135-
implementation(project(":test-utils"))
136-
}
130+
commonTest.dependencies {
131+
implementation(project(":test-utils"))
137132
}
138133

139-
getByName("androidMain") {
140-
dependencies {
141-
api(libs.google.firebase.common)
142-
}
134+
androidMain.dependencies {
135+
api(libs.google.firebase.common)
143136
}
144137

145-
getByName("jvmMain") {
138+
val jvmMain by getting {
146139
kotlin.srcDir("src/androidMain/kotlin")
147140
}
148141
}

‎firebase-auth/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTes
1212
version = project.property("firebase-auth.version") as String
1313

1414
plugins {
15-
id("com.android.library")
16-
kotlin("multiplatform")
17-
kotlin("native.cocoapods")
15+
alias(libs.plugins.android.library)
16+
alias(libs.plugins.native.cocoapods)
17+
alias(libs.plugins.multiplatform)
1818
id("testOptionsConvention")
1919
}
2020

‎firebase-common-internal/build.gradle.kts

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-common-internal.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("multiplatform")
15-
kotlin("plugin.serialization")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.multiplatform)
15+
alias(libs.plugins.kotlinx.serialization)
1616
id("testOptionsConvention")
1717
}
1818

@@ -112,36 +112,26 @@ kotlin {
112112
}
113113
}
114114

115-
getByName("commonMain") {
116-
dependencies {
117-
implementation(project(":firebase-common"))
118-
api(libs.kotlinx.serialization.core)
119-
}
115+
commonMain.dependencies {
116+
implementation(project(":firebase-common"))
117+
api(libs.kotlinx.serialization.core)
120118
}
121-
122-
getByName("commonTest") {
123-
dependencies {
124-
implementation(project(":test-utils"))
125-
}
119+
commonTest.dependencies {
120+
implementation(project(":test-utils"))
126121
}
127122

128-
getByName("androidMain") {
129-
dependencies {
130-
api(libs.google.firebase.common)
131-
}
123+
androidMain.dependencies {
124+
api(libs.google.firebase.common)
132125
}
133126

134-
getByName("jsMain") {
135-
dependencies {
136-
api(npm("firebase", "10.12.2"))
137-
}
127+
jsMain.dependencies {
128+
api(npm("firebase", "10.12.2"))
138129
}
139130

140-
getByName("jvmMain") {
131+
val jvmMain by getting {
141132
kotlin.srcDir("src/androidMain/kotlin")
142133
}
143-
144-
getByName("jvmTest") {
134+
val jvmTest by getting {
145135
dependencies {
146136
implementation(kotlin("test-junit"))
147137
}

‎firebase-common/build.gradle.kts

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-common.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("multiplatform")
15-
kotlin("plugin.serialization")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.multiplatform)
15+
alias(libs.plugins.kotlinx.serialization)
1616
id("testOptionsConvention")
1717
}
1818

@@ -111,35 +111,25 @@ kotlin {
111111
}
112112
}
113113

114-
getByName("commonMain") {
115-
dependencies {
116-
api(libs.kotlinx.serialization.core)
117-
}
114+
commonMain.dependencies {
115+
api(libs.kotlinx.serialization.core)
118116
}
119-
120-
getByName("commonTest") {
121-
dependencies {
122-
implementation(project(":test-utils"))
123-
}
117+
commonTest.dependencies {
118+
implementation(project(":test-utils"))
124119
}
125120

126-
getByName("androidMain") {
127-
dependencies {
128-
api(libs.google.firebase.common)
129-
}
121+
androidMain.dependencies {
122+
api(libs.google.firebase.common)
130123
}
131124

132-
getByName("jsMain") {
133-
dependencies {
134-
api(npm("firebase", "10.12.2"))
135-
}
125+
jsMain.dependencies {
126+
api(npm("firebase", "10.12.2"))
136127
}
137128

138-
getByName("jvmMain") {
129+
val jvmMain by getting {
139130
kotlin.srcDir("src/androidMain/kotlin")
140131
}
141-
142-
getByName("jvmTest") {
132+
val jvmTest by getting {
143133
dependencies {
144134
implementation(kotlin("test-junit"))
145135
}

‎firebase-config/build.gradle.kts

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-config.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("multiplatform")
15-
kotlin("native.cocoapods")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.native.cocoapods)
15+
alias(libs.plugins.multiplatform)
1616
id("testOptionsConvention")
1717
}
1818

@@ -117,27 +117,20 @@ kotlin {
117117
}
118118
}
119119

120-
getByName("commonMain") {
121-
dependencies {
122-
api(project(":firebase-app"))
123-
implementation(project(":firebase-common"))
124-
api(libs.kotlinx.datetime)
125-
}
120+
commonMain.dependencies {
121+
api(project(":firebase-app"))
122+
implementation(project(":firebase-common"))
123+
api(libs.kotlinx.datetime)
126124
}
127-
128-
getByName("commonTest") {
129-
dependencies {
130-
implementation(project(":test-utils"))
131-
}
125+
commonTest.dependencies {
126+
implementation(project(":test-utils"))
132127
}
133128

134-
getByName("androidMain") {
135-
dependencies {
136-
api(libs.google.firebase.config)
137-
}
129+
androidMain.dependencies {
130+
api(libs.google.firebase.config)
138131
}
139132

140-
getByName("jvmMain") {
133+
val jvmMain by getting {
141134
kotlin.srcDir("src/androidMain/kotlin")
142135
}
143136
}

‎firebase-crashlytics/build.gradle.kts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-crashlytics.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("multiplatform")
15-
kotlin("native.cocoapods")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.native.cocoapods)
15+
alias(libs.plugins.multiplatform)
1616
id("testOptionsConvention")
1717
}
1818

@@ -106,23 +106,16 @@ kotlin {
106106
}
107107
}
108108

109-
getByName("commonMain") {
110-
dependencies {
111-
api(project(":firebase-app"))
112-
implementation(project(":firebase-common"))
113-
}
109+
commonMain.dependencies {
110+
api(project(":firebase-app"))
111+
implementation(project(":firebase-common"))
114112
}
115-
116-
getByName("commonTest") {
117-
dependencies {
118-
implementation(project(":test-utils"))
119-
}
113+
commonTest.dependencies {
114+
implementation(project(":test-utils"))
120115
}
121116

122-
getByName("androidMain") {
123-
dependencies {
124-
api(libs.google.firebase.crashlytics)
125-
}
117+
androidMain.dependencies {
118+
api(libs.google.firebase.crashlytics)
126119
}
127120

128121
// getByName("jvmMain") {

‎firebase-database/build.gradle.kts

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
1010
version = project.property("firebase-database.version") as String
1111

1212
plugins {
13-
id("com.android.library")
14-
kotlin("native.cocoapods")
15-
kotlin("multiplatform")
16-
kotlin("plugin.serialization")
13+
alias(libs.plugins.android.library)
14+
alias(libs.plugins.native.cocoapods)
15+
alias(libs.plugins.multiplatform)
16+
alias(libs.plugins.kotlinx.serialization)
1717
id("testOptionsConvention")
1818
}
1919

@@ -127,30 +127,20 @@ kotlin {
127127
}
128128
}
129129

130-
getByName("commonMain") {
131-
dependencies {
132-
api(project(":firebase-app"))
133-
api(project(":firebase-common"))
134-
implementation(project(":firebase-common-internal"))
135-
}
130+
commonMain.dependencies {
131+
api(project(":firebase-app"))
132+
api(project(":firebase-common"))
133+
implementation(project(":firebase-common-internal"))
136134
}
137-
138-
getByName("commonTest") {
139-
dependencies {
140-
implementation(project(":test-utils"))
141-
}
135+
commonTest.dependencies {
136+
implementation(project(":test-utils"))
142137
}
143138

144-
getByName("jvmMain") {
145-
kotlin.srcDir("src/androidMain/kotlin")
139+
androidMain.dependencies {
140+
api(libs.google.firebase.database)
146141
}
147142

148-
getByName("androidMain") {
149-
dependencies {
150-
api(libs.google.firebase.database)
151-
}
152-
}
153-
getByName("jvmMain") {
143+
val jvmMain by getting {
154144
kotlin.srcDir("src/androidMain/kotlin")
155145
}
156146
}

0 commit comments

Comments
 (0)