Skip to content

Commit 096f468

Browse files
nbransbynbransby
authored
Merge pull request #532 from siarhei-luskanau/toml
Moved dependency declarations to the TOML file
2 parents bf112f7 + c189411 commit 096f468

File tree

19 files changed

+125
-140
lines changed

19 files changed

+125
-140
lines changed

‎build.gradle.kts

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,14 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
22
import org.gradle.api.tasks.testing.logging.TestLogEvent
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
4-
5-
repositories {
6-
google()
7-
mavenCentral()
8-
}
93

104
plugins {
11-
kotlin("multiplatform") apply false
12-
kotlin("native.cocoapods") apply false
5+
alias(libs.plugins.android.application) apply false
6+
alias(libs.plugins.kotlinx.serialization) apply false
7+
alias(libs.plugins.multiplatform) apply false
8+
alias(libs.plugins.native.cocoapods) apply false
9+
alias(libs.plugins.test.logger.plugin) apply false
10+
alias(libs.plugins.ben.manes.versions) apply false
1311
id("base")
14-
id("com.github.ben-manes.versions") version "0.42.0"
15-
}
16-
17-
buildscript {
18-
repositories {
19-
google()
20-
mavenCentral()
21-
gradlePluginPortal()
22-
maven {
23-
url = uri("https://plugins.gradle.org/m2/")
24-
}
25-
}
26-
dependencies {
27-
classpath("com.android.tools.build:gradle:${project.extra["gradlePluginVersion"]}")
28-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.extra["kotlinVersion"]}")
29-
classpath("com.adarshr:gradle-test-logger-plugin:3.2.0")
30-
}
3112
}
3213

3314
val compileSdkVersion by extra(34)
@@ -108,31 +89,27 @@ subprojects {
10889
}
10990

11091
afterEvaluate {
111-
112-
val coroutinesVersion: String by project
113-
val firebaseBoMVersion: String by project
114-
11592
dependencies {
116-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
117-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
118-
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:$firebaseBoMVersion"))
93+
"commonMainImplementation"(libs.kotlinx.coroutines.core)
94+
"androidMainImplementation"(libs.kotlinx.coroutines.play.services)
95+
"androidMainImplementation"(platform(libs.firebase.bom))
11996
"commonTestImplementation"(kotlin("test-common"))
12097
"commonTestImplementation"(kotlin("test-annotations-common"))
12198
if (this@afterEvaluate.name != "firebase-crashlytics") {
122-
"jvmMainApi"("dev.gitlive:firebase-java-sdk:0.4.3")
123-
"jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") {
99+
"jvmMainApi"(libs.gitlive.firebase.java.sdk)
100+
"jvmMainApi"(libs.kotlinx.coroutines.play.services) {
124101
exclude("com.google.android.gms")
125102
}
126103
"jsTestImplementation"(kotlin("test-js"))
127104
"jvmTestImplementation"(kotlin("test-junit"))
128-
"jvmTestImplementation"("junit:junit:4.13.2")
105+
"jvmTestImplementation"(libs.junit)
129106
}
130107
"androidInstrumentedTestImplementation"(kotlin("test-junit"))
131108
"androidUnitTestImplementation"(kotlin("test-junit"))
132-
"androidInstrumentedTestImplementation"("junit:junit:4.13.2")
133-
"androidInstrumentedTestImplementation"("androidx.test:core:1.5.0")
134-
"androidInstrumentedTestImplementation"("androidx.test.ext:junit:1.1.5")
135-
"androidInstrumentedTestImplementation"("androidx.test:runner:1.5.2")
109+
"androidInstrumentedTestImplementation"(libs.junit)
110+
"androidInstrumentedTestImplementation"(libs.androidx.test.core)
111+
"androidInstrumentedTestImplementation"(libs.androidx.test.junit)
112+
"androidInstrumentedTestImplementation"(libs.androidx.test.runner)
136113
}
137114
}
138115

‎firebase-analytics/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,8 @@ kotlin {
121121
sourceSets {
122122
all {
123123
languageSettings.apply {
124-
val apiVersion: String by project
125-
val languageVersion: String by project
126-
this.apiVersion = apiVersion
127-
this.languageVersion = languageVersion
124+
this.apiVersion = libs.versions.settings.api.get()
125+
this.languageVersion = libs.versions.settings.language.get()
128126
progressiveMode = true
129127
if (name.lowercase().contains("ios")) {
130128
optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -147,7 +145,7 @@ kotlin {
147145

148146
getByName("androidMain") {
149147
dependencies {
150-
api("com.google.firebase:firebase-analytics")
148+
api(libs.google.firebase.analytics)
151149
}
152150
}
153151
}

‎firebase-app/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ kotlin {
117117
sourceSets {
118118
all {
119119
languageSettings.apply {
120-
val apiVersion: String by project
121-
val languageVersion: String by project
122-
this.apiVersion = apiVersion
123-
this.languageVersion = languageVersion
120+
this.apiVersion = libs.versions.settings.api.get()
121+
this.languageVersion = libs.versions.settings.language.get()
124122
progressiveMode = true
125123
if (name.lowercase().contains("ios")) {
126124
optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -142,7 +140,7 @@ kotlin {
142140

143141
getByName("androidMain") {
144142
dependencies {
145-
api("com.google.firebase:firebase-common-ktx")
143+
api(libs.google.firebase.common.ktx)
146144
}
147145
}
148146

‎firebase-auth/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ kotlin {
129129
sourceSets {
130130
all {
131131
languageSettings.apply {
132-
val apiVersion: String by project
133-
val languageVersion: String by project
134-
this.apiVersion = apiVersion
135-
this.languageVersion = languageVersion
132+
this.apiVersion = libs.versions.settings.api.get()
133+
this.languageVersion = libs.versions.settings.language.get()
136134
progressiveMode = true
137135
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
138136
if (name.lowercase().contains("ios")) {
@@ -157,7 +155,7 @@ kotlin {
157155

158156
getByName("androidMain") {
159157
dependencies {
160-
api("com.google.firebase:firebase-auth-ktx")
158+
api(libs.google.firebase.auth.ktx)
161159
}
162160
}
163161
}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ kotlin {
110110
sourceSets {
111111
all {
112112
languageSettings.apply {
113-
val apiVersion: String by project
114-
val languageVersion: String by project
115-
this.apiVersion = apiVersion
116-
this.languageVersion = languageVersion
113+
this.apiVersion = libs.versions.settings.api.get()
114+
this.languageVersion = libs.versions.settings.language.get()
117115
progressiveMode = true
118116
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
119117
optIn("kotlinx.serialization.ExperimentalSerializationApi")
@@ -122,11 +120,9 @@ kotlin {
122120
}
123121

124122
getByName("commonMain") {
125-
val serializationVersion: String by project
126-
127123
dependencies {
128124
implementation(project(":firebase-common"))
129-
api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
125+
api(libs.kotlinx.serialization.core)
130126
}
131127
}
132128

@@ -138,7 +134,7 @@ kotlin {
138134

139135
getByName("androidMain") {
140136
dependencies {
141-
api("com.google.firebase:firebase-common-ktx")
137+
api(libs.google.firebase.common.ktx)
142138
}
143139
}
144140

‎firebase-common/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ kotlin {
110110
sourceSets {
111111
all {
112112
languageSettings.apply {
113-
val apiVersion: String by project
114-
val languageVersion: String by project
115-
this.apiVersion = apiVersion
116-
this.languageVersion = languageVersion
113+
this.apiVersion = libs.versions.settings.api.get()
114+
this.languageVersion = libs.versions.settings.language.get()
117115
progressiveMode = true
118116
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
119117
optIn("kotlinx.serialization.ExperimentalSerializationApi")
@@ -122,10 +120,8 @@ kotlin {
122120
}
123121

124122
getByName("commonMain") {
125-
val serializationVersion: String by project
126-
127123
dependencies {
128-
api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
124+
api(libs.kotlinx.serialization.core)
129125
}
130126
}
131127

@@ -137,7 +133,7 @@ kotlin {
137133

138134
getByName("androidMain") {
139135
dependencies {
140-
api("com.google.firebase:firebase-common-ktx")
136+
api(libs.google.firebase.common.ktx)
141137
}
142138
}
143139

‎firebase-config/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@ kotlin {
125125
sourceSets {
126126
all {
127127
languageSettings.apply {
128-
val apiVersion: String by project
129-
val languageVersion: String by project
130-
this.apiVersion = apiVersion
131-
this.languageVersion = languageVersion
128+
this.apiVersion = libs.versions.settings.api.get()
129+
this.languageVersion = libs.versions.settings.language.get()
132130
progressiveMode = true
133131
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
134132
if (name.lowercase().contains("ios")) {
@@ -153,7 +151,7 @@ kotlin {
153151

154152
getByName("androidMain") {
155153
dependencies {
156-
api("com.google.firebase:firebase-config-ktx")
154+
api(libs.google.firebase.config.ktx)
157155
}
158156
}
159157

‎firebase-crashlytics/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ kotlin {
100100
sourceSets {
101101
all {
102102
languageSettings.apply {
103-
val apiVersion: String by project
104-
val languageVersion: String by project
105-
this.apiVersion = apiVersion
106-
this.languageVersion = languageVersion
103+
this.apiVersion = libs.versions.settings.api.get()
104+
this.languageVersion = libs.versions.settings.language.get()
107105
progressiveMode = true
108106
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
109107
if (name.lowercase().contains("ios")) {
@@ -127,7 +125,7 @@ kotlin {
127125

128126
getByName("androidMain") {
129127
dependencies {
130-
api("com.google.firebase:firebase-crashlytics-ktx")
128+
api(libs.google.firebase.crashlytics.ktx)
131129
}
132130
}
133131

‎firebase-database/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@ kotlin {
126126
sourceSets {
127127
all {
128128
languageSettings.apply {
129-
val apiVersion: String by project
130-
val languageVersion: String by project
131-
this.apiVersion = apiVersion
132-
this.languageVersion = languageVersion
129+
this.apiVersion = libs.versions.settings.api.get()
130+
this.languageVersion = libs.versions.settings.language.get()
133131
progressiveMode = true
134132
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
135133
optIn("kotlinx.coroutines.FlowPreview")
@@ -160,7 +158,7 @@ kotlin {
160158

161159
getByName("androidMain") {
162160
dependencies {
163-
api("com.google.firebase:firebase-database-ktx")
161+
api(libs.google.firebase.database.ktx)
164162
}
165163
}
166164
getByName("jvmMain") {

‎firebase-firestore/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,8 @@ kotlin {
138138
sourceSets {
139139
all {
140140
languageSettings.apply {
141-
val apiVersion: String by project
142-
val languageVersion: String by project
143-
this.apiVersion = apiVersion
144-
this.languageVersion = languageVersion
141+
this.apiVersion = libs.versions.settings.api.get()
142+
this.languageVersion = libs.versions.settings.language.get()
145143
progressiveMode = true
146144
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
147145
optIn("kotlinx.serialization.InternalSerializationApi")
@@ -169,7 +167,7 @@ kotlin {
169167

170168
getByName("androidMain") {
171169
dependencies {
172-
api("com.google.firebase:firebase-firestore")
170+
api(libs.google.firebase.firestore)
173171
}
174172
}
175173

‎firebase-functions/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,8 @@ kotlin {
116116
sourceSets {
117117
all {
118118
languageSettings.apply {
119-
val apiVersion: String by project
120-
val languageVersion: String by project
121-
this.apiVersion = apiVersion
122-
this.languageVersion = languageVersion
119+
this.apiVersion = libs.versions.settings.api.get()
120+
this.languageVersion = libs.versions.settings.language.get()
123121
progressiveMode = true
124122
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
125123
optIn("kotlinx.serialization.InternalSerializationApi")
@@ -145,7 +143,7 @@ kotlin {
145143

146144
getByName("androidMain") {
147145
dependencies {
148-
api("com.google.firebase:firebase-functions")
146+
api(libs.google.firebase.functions)
149147
}
150148
}
151149

‎firebase-installations/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,8 @@ kotlin {
120120
sourceSets {
121121
all {
122122
languageSettings.apply {
123-
val apiVersion: String by project
124-
val languageVersion: String by project
125-
this.apiVersion = apiVersion
126-
this.languageVersion = languageVersion
123+
this.apiVersion = libs.versions.settings.api.get()
124+
this.languageVersion = libs.versions.settings.language.get()
127125
progressiveMode = true
128126
if (name.lowercase().contains("ios")) {
129127
optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -146,7 +144,7 @@ kotlin {
146144

147145
getByName("androidMain") {
148146
dependencies {
149-
api("com.google.firebase:firebase-installations-ktx")
147+
api(libs.google.firebase.installations.ktx)
150148
}
151149
}
152150

‎firebase-messaging/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,8 @@ kotlin {
120120
sourceSets {
121121
all {
122122
languageSettings.apply {
123-
val apiVersion: String by project
124-
val languageVersion: String by project
125-
this.apiVersion = apiVersion
126-
this.languageVersion = languageVersion
123+
this.apiVersion = libs.versions.settings.api.get()
124+
this.languageVersion = libs.versions.settings.language.get()
127125
progressiveMode = true
128126
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
129127
if (name.lowercase().contains("ios")) {
@@ -148,7 +146,7 @@ kotlin {
148146

149147
getByName("androidMain") {
150148
dependencies {
151-
api("com.google.firebase:firebase-messaging")
149+
api(libs.google.firebase.messaging)
152150
}
153151
}
154152
}

‎firebase-perf/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,8 @@ kotlin {
112112
sourceSets {
113113
all {
114114
languageSettings.apply {
115-
val apiVersion: String by project
116-
val languageVersion: String by project
117-
this.apiVersion = apiVersion
118-
this.languageVersion = languageVersion
115+
this.apiVersion = libs.versions.settings.api.get()
116+
this.languageVersion = libs.versions.settings.language.get()
119117
progressiveMode = true
120118
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
121119
if (name.lowercase().contains("ios")) {
@@ -139,7 +137,7 @@ kotlin {
139137

140138
getByName("androidMain") {
141139
dependencies {
142-
api("com.google.firebase:firebase-perf-ktx")
140+
api(libs.google.firebase.perf.ktx)
143141
}
144142
}
145143

0 commit comments

Comments
 (0)