Skip to content

Commit d298117

Browse files
authored
[TAS-239] Replace Deps with Gradle dependency catalog (#172)
1 parent 838a3bd commit d298117

File tree

60 files changed

+393
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+393
-383
lines changed

common/analytics-testfixtures/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("node-module-plugin")
2+
alias(libs.plugins.thecodinglove.node.module)
33
}
44

55
group = "com.gchristov.thecodinglove.common"

common/analytics/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import com.gchristov.thecodinglove.gradleplugins.envSecret
33
val packageId = "com.gchristov.thecodinglove.common.analytics"
44

55
plugins {
6-
id("node-module-plugin")
7-
id("build-config-plugin")
6+
alias(libs.plugins.thecodinglove.node.module)
7+
alias(libs.plugins.thecodinglove.build.config)
88
}
99

1010
group = "com.gchristov.thecodinglove.common"

common/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
allprojects {
2-
repositories {
3-
mavenCentral()
4-
}
5-
}
6-
71
val taskNames = listOf("clean", "assemble", "jsTest", "kotlinUpgradeYarnLock")
82
taskNames.forEach { taskName ->
93
tasks.register("${taskName}All") {

common/firebase/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import com.gchristov.thecodinglove.gradleplugins.Deps
2-
31
plugins {
4-
id("node-module-plugin")
2+
alias(libs.plugins.thecodinglove.node.module)
53
}
64

75
group = "com.gchristov.thecodinglove.common"
@@ -16,7 +14,8 @@ kotlin {
1614
}
1715
val jsMain by getting {
1816
dependencies {
19-
implementation(npm(Deps.Google.firebaseAdmin.name, Deps.Google.firebaseAdmin.version))
17+
implementation(npm(libs.npm.firebase.admin.get().name, libs.npm.firebase.admin.get().version!!))
18+
implementation(npm(libs.npm.google.firestore.get().name, libs.npm.google.firestore.get().version!!))
2019
}
2120
}
2221
}

common/kotlin-js-store/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
dependencies:
100100
tslib "^2.1.0"
101101

102-
"@google-cloud/firestore@^6.8.0":
102+
"@google-cloud/firestore@6.8.0", "@google-cloud/firestore@^6.8.0":
103103
version "6.8.0"
104104
resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.8.0.tgz#d8c852844c381afaf62592796606c10e178400b5"
105105
integrity sha512-JRpk06SmZXLGz0pNx1x7yU3YhkUXheKgH5hbDZ4kMsdhtfV5qPLJLRI4wv69K0cZorIk+zTMOwptue7hizo0eA==

common/kotlin/build.gradle.kts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import com.gchristov.thecodinglove.gradleplugins.Deps
2-
31
plugins {
4-
id("base-node-plugin")
2+
alias(libs.plugins.thecodinglove.base.node)
53
}
64

75
group = "com.gchristov.thecodinglove.common"
@@ -11,15 +9,15 @@ kotlin {
119
sourceSets {
1210
val commonMain by getting {
1311
dependencies {
14-
api(Deps.Kodein.di)
15-
api(Deps.Kermit.logger)
16-
api(Deps.Kotlin.coroutinesCore)
17-
api(Deps.Kotlin.dateTime)
18-
api(Deps.Kotlin.serialization)
19-
api(Deps.Uuid.uuid)
20-
api(Deps.Arrow.core)
21-
api(Deps.Crypto.mac)
22-
api(Deps.Crypto.encoding)
12+
api(libs.kodein)
13+
api(libs.touchlab.kermit)
14+
api(libs.kotlinx.coroutines.core)
15+
api(libs.kotlinx.datetime)
16+
api(libs.kotlinx.serialization.json)
17+
api(libs.uuid)
18+
api(libs.arrow.core)
19+
api(libs.diglol.crypto)
20+
api(libs.diglol.encoding)
2321
}
2422
}
2523
}

common/monitoring/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import com.gchristov.thecodinglove.gradleplugins.envSecret
33
val packageId = "com.gchristov.thecodinglove.common.monitoring"
44

55
plugins {
6-
id("node-module-plugin")
7-
id("build-config-plugin")
6+
alias(libs.plugins.thecodinglove.node.module)
7+
alias(libs.plugins.thecodinglove.build.config)
88
}
99

1010
group = "com.gchristov.thecodinglove.common"

common/network-testfixtures/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("node-module-plugin")
2+
alias(libs.plugins.thecodinglove.node.module)
33
}
44

55
group = "com.gchristov.thecodinglove.common"

common/network/build.gradle.kts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import com.gchristov.thecodinglove.gradleplugins.Deps
2-
31
plugins {
4-
id("node-module-plugin")
2+
alias(libs.plugins.thecodinglove.node.module)
53
}
64

75
group = "com.gchristov.thecodinglove.common"
@@ -12,16 +10,16 @@ kotlin {
1210
val commonMain by getting {
1311
dependencies {
1412
implementation(projects.kotlin)
15-
api(Deps.Ktor.client)
16-
implementation(Deps.Ktor.contentNegotiation)
17-
implementation(Deps.Ktor.serialization)
18-
implementation(Deps.Ktor.logging)
19-
implementation(Deps.Ktor.logback)
13+
api(libs.ktor.client.core)
14+
implementation(libs.ktor.client.contentNegotiation)
15+
implementation(libs.ktor.client.serializationJson)
16+
implementation(libs.ktor.client.logging)
17+
implementation(libs.logback)
2018
}
2119
}
2220
val jsMain by getting {
2321
dependencies {
24-
implementation(npm(Deps.Node.express.name, Deps.Node.express.version))
22+
implementation(npm(libs.npm.express.get().name, libs.npm.express.get().version!!))
2523
}
2624
}
2725
}

common/pubsub-testfixtures/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("node-module-plugin")
2+
alias(libs.plugins.thecodinglove.node.module)
33
}
44

55
group = "com.gchristov.thecodinglove.common"

0 commit comments

Comments
 (0)