Skip to content

Commit 279bfbf

Browse files
slissonslisson
authored
Merge pull request #85 from modelix/version-catalog
build: use version catalog instead of properties
2 parents 4e1a2c5 + bd5cff7 commit 279bfbf

File tree

14 files changed

+165
-156
lines changed

14 files changed

+165
-156
lines changed

‎authorization/build.gradle.kts‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@ plugins {
55
kotlin("plugin.serialization")
66
}
77

8-
val ktorVersion: String by rootProject
9-
val modelixCoreVersion: String by rootProject
10-
val kotlinCoroutinesVersion: String by rootProject
11-
val kotlinVersion: String by rootProject
12-
val logbackVersion: String by rootProject
13-
148
dependencies {
15-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
16-
implementation("com.charleskorn.kaml:kaml:0.40.0")
17-
implementation("org.keycloak:keycloak-authz-client:18.0.1")
18-
implementation("com.google.guava:guava:31.1-jre")
19-
api("io.ktor:ktor-server-auth:$ktorVersion")
20-
implementation("io.ktor:ktor-server-status-pages:$ktorVersion")
21-
api("io.ktor:ktor-server-auth:$ktorVersion")
22-
api("io.ktor:ktor-server-auth-jwt:$ktorVersion")
23-
implementation("io.ktor:ktor-server-sessions:$ktorVersion")
24-
implementation("io.ktor:ktor-server-forwarded-header:$ktorVersion")
25-
implementation("io.ktor", "ktor-client-cio", ktorVersion)
9+
implementation(libs.kotlin.serialization.json)
10+
implementation(libs.kotlin.serialization.yaml)
11+
implementation(libs.keycloak.authz.client)
12+
implementation(libs.guava)
13+
api(libs.ktor.server.auth)
14+
api(libs.ktor.server.auth.jwt)
15+
implementation(libs.ktor.server.status.pages)
16+
implementation(libs.ktor.server.sessions)
17+
implementation(libs.ktor.server.forwarded.header)
18+
implementation(libs.ktor.client.cio)
2619
}
2720

2821
tasks.getByName<Test>("test") {

‎build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ buildscript {
1111
}
1212

1313
plugins {
14-
kotlin("multiplatform") apply false
15-
kotlin("plugin.serialization") apply false
1614
`maven-publish`
17-
id("com.palantir.git-version") version "0.13.0"
18-
id("org.jlleitschuh.gradle.ktlint") version "10.3.0" apply false
19-
id("com.diffplug.spotless") version "5.0.0" apply false
20-
id("com.dorongold.task-tree") version "2.1.0"
15+
alias(libs.plugins.kotlin.multiplatform) apply false
16+
alias(libs.plugins.kotlin.serialization) apply false
17+
alias(libs.plugins.gitVersion)
18+
alias(libs.plugins.ktlint) apply false
19+
alias(libs.plugins.spotless) apply false
20+
alias(libs.plugins.tasktree)
2121
id("org.jetbrains.dokka") version "1.8.10"
2222
}
2323

‎gradle/libs.versions.toml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
[versions]
2+
kotlin = "1.8.20"
3+
kotlinCoroutines="1.6.4"
4+
ktor="2.2.4"
5+
kotlinHtml="0.8.0"
6+
kotlinSerialization="1.5.0"
7+
ignite="2.13.0"
8+
9+
[libraries]
10+
kotlin-stdlib-common = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common", version.ref = "kotlin" }
11+
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinSerialization" }
12+
kotlin-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.40.0" }
13+
kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
14+
kotlin-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version = "0.3.5" }
15+
kotlin-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.0" }
16+
17+
kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
18+
kotlin-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinCoroutines" }
19+
kotlin-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinCoroutines" }
20+
21+
ktor-server-auth = { group = "io.ktor", name = "ktor-server-auth", version.ref = "ktor" }
22+
ktor-server-auth-jwt = { group = "io.ktor", name = "ktor-server-auth-jwt", version.ref = "ktor" }
23+
ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
24+
ktor-server-cors = { group = "io.ktor", name = "ktor-server-cors", version.ref = "ktor" }
25+
ktor-server-forwarded-header = { group = "io.ktor", name = "ktor-server-forwarded-header", version.ref = "ktor" }
26+
ktor-server-content-negotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" }
27+
ktor-server-html-builder = { group = "io.ktor", name = "ktor-server-html-builder", version.ref = "ktor" }
28+
ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
29+
ktor-server-sessions = { group = "io.ktor", name = "ktor-server-sessions", version.ref = "ktor" }
30+
ktor-server-status-pages = { group = "io.ktor", name = "ktor-server-status-pages", version.ref = "ktor" }
31+
ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
32+
ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
33+
34+
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
35+
ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
36+
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
37+
ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" }
38+
ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
39+
ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref = "ktor" }
40+
41+
ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
42+
43+
keycloak-authz-client = { group = "org.keycloak", name = "keycloak-authz-client", version = "18.0.1" }
44+
guava = { group = "com.google.guava", name = "guava", version = "31.1-jre" }
45+
modelix-incremental = { group = "org.modelix", name = "incremental", version = "0.1.4" }
46+
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.12.0" }
47+
vavr = { group = "io.vavr", name = "vavr", version = "0.10.3" }
48+
apache-commons-lang = { group = "org.apache.commons", name = "commons-lang3", version = "3.11" }
49+
apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.7" }
50+
apache-commons-collections = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" }
51+
trove4j = { group = "net.sf.trove4j", name = "trove4j", version = "3.0.3" }
52+
53+
ignite-core = { group = "org.apache.ignite", name = "ignite-core", version.ref = "ignite" }
54+
ignite-spring = { group = "org.apache.ignite", name = "ignite-spring", version.ref = "ignite" }
55+
ignite-indexing = { group = "org.apache.ignite", name = "ignite-indexing", version.ref = "ignite" }
56+
57+
[bundles]
58+
ignite = ["ignite-core", "ignite-spring", "ignite-indexing"]
59+
60+
[plugins]
61+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
62+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
63+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
64+
gitVersion = { id = "com.palantir.git-version", version = "0.13.0" }
65+
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.3.0" }
66+
spotless = { id = "com.diffplug.spotless", version = "5.0.0" }
67+
tasktree = { id = "com.dorongold.task-tree", version = "2.1.0" }
68+
modelix-mps-buildtools = { id = "org.modelix.mps.build-tools", version = "1.0.11" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎light-model-client/build.gradle.kts‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ plugins {
33
`maven-publish`
44
}
55

6-
val kotlinVersion: String by rootProject
7-
val kotlinCoroutinesVersion: String by rootProject
8-
val ktorVersion: String by rootProject
9-
val kotlinLoggingVersion: String by rootProject
10-
val kotlinxHtmlVersion: String by rootProject
11-
val modelixIncrementalVersion: String by rootProject
12-
136
kotlin {
147
jvm()
158
js(IR) {
@@ -30,10 +23,10 @@ kotlin {
3023
implementation(project(":model-api"))
3124
implementation(project(":model-api-gen-runtime"))
3225
implementation(project(":model-server-api"))
33-
implementation("io.ktor:ktor-client-websockets:$ktorVersion")
34-
implementation(kotlin("stdlib-common"))
35-
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
36-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
26+
implementation(libs.ktor.client.websockets)
27+
implementation(libs.kotlin.stdlib.common)
28+
implementation(libs.kotlin.logging)
29+
implementation(libs.kotlin.coroutines.core)
3730

3831
// implementation("io.ktor:ktor-client-core:$ktorVersion")
3932
// implementation("io.ktor:ktor-client-cio:$ktorVersion")
@@ -44,14 +37,14 @@ kotlin {
4437
}
4538
val commonTest by getting {
4639
dependencies {
47-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion")
40+
implementation(libs.kotlin.coroutines.test)
4841
implementation(kotlin("test-common"))
4942
implementation(kotlin("test-annotations-common"))
5043
}
5144
}
5245
val jvmMain by getting {
5346
dependencies {
54-
implementation("io.ktor:ktor-client-cio:$ktorVersion")
47+
implementation(libs.ktor.client.cio)
5548
}
5649
}
5750
val jvmTest by getting {
@@ -61,21 +54,21 @@ kotlin {
6154

6255
implementation(project(":model-server"))
6356
implementation(project(":authorization"))
64-
implementation("io.ktor:ktor-server-core:$ktorVersion")
65-
implementation("io.ktor:ktor-server-cors:$ktorVersion")
66-
implementation("io.ktor:ktor-server-netty:$ktorVersion")
67-
implementation("io.ktor:ktor-server-html-builder:$ktorVersion")
68-
implementation("io.ktor:ktor-server-auth:$ktorVersion")
69-
implementation("io.ktor:ktor-server-auth-jwt:$ktorVersion")
70-
implementation("io.ktor:ktor-server-status-pages:$ktorVersion")
71-
implementation("io.ktor:ktor-server-forwarded-header:$ktorVersion")
72-
implementation("io.ktor:ktor-server-websockets:$ktorVersion")
73-
implementation("io.ktor:ktor-server-test-host:$ktorVersion")
57+
implementation(libs.ktor.server.core)
58+
implementation(libs.ktor.server.cors)
59+
implementation(libs.ktor.server.netty)
60+
implementation(libs.ktor.server.html.builder)
61+
implementation(libs.ktor.server.auth)
62+
implementation(libs.ktor.server.auth.jwt)
63+
implementation(libs.ktor.server.status.pages)
64+
implementation(libs.ktor.server.forwarded.header)
65+
implementation(libs.ktor.server.websockets)
66+
implementation(libs.ktor.server.test.host)
7467
}
7568
}
7669
val jsMain by getting {
7770
dependencies {
78-
implementation("io.ktor:ktor-client-js:$ktorVersion")
71+
implementation(libs.ktor.client.js)
7972
}
8073
}
8174
val jsTest by getting {

‎metamodel-export/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.modelix.gradle.mpsbuild.MPSBuildSettings
22

33
plugins {
44
base
5-
id("org.modelix.mps.build-tools") version "1.0.11"
5+
alias(libs.plugins.modelix.mps.buildtools)
66
}
77

88
group = "org.modelix.mps"

‎model-api-gen-runtime/build.gradle.kts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
kotlin("plugin.serialization")
44
}
55

6-
val kotlinVersion: String by rootProject
7-
val kotlinLoggingVersion: String by rootProject
86
val mpsExtensionsVersion: String by rootProject
97

108
kotlin {
@@ -30,8 +28,8 @@ kotlin {
3028
val commonMain by getting {
3129
dependencies {
3230
implementation(kotlin("stdlib-common"))
33-
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
34-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
31+
implementation(libs.kotlin.logging)
32+
implementation(libs.kotlin.serialization.json)
3533
api(project(":model-api"))
3634
}
3735
}
@@ -43,7 +41,7 @@ kotlin {
4341
}
4442
val jvmMain by getting {
4543
dependencies {
46-
implementation("com.charleskorn.kaml:kaml:0.48.0")
44+
implementation(libs.kotlin.serialization.yaml)
4745
}
4846
}
4947
val jvmTest by getting {

‎model-api-gen/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ val kotlinxSerializationVersion: String by rootProject
77
val kotlinCollectionsImmutableVersion: String by rootProject
88

99
dependencies {
10-
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:$kotlinCollectionsImmutableVersion")
11-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
12-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion")
13-
implementation("com.charleskorn.kaml:kaml:0.40.0")
10+
implementation(libs.kotlin.collections.immutable)
11+
implementation(kotlin("stdlib-jdk8"))
12+
implementation(libs.kotlin.serialization.json)
13+
implementation(libs.kotlin.serialization.yaml)
1414
implementation(project(":model-api-gen-runtime"))
15-
implementation("com.squareup:kotlinpoet:1.12.0")
16-
implementation("org.jetbrains.kotlin:kotlin-reflect")
15+
implementation(libs.kotlinpoet)
16+
implementation(kotlin("reflect"))
1717
testImplementation(kotlin("test"))
1818
testImplementation(kotlin("test-junit"))
1919
}

‎model-api/build.gradle.kts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ tasks.named("check") {
2626
dependsOn("ktlintCheck")
2727
}
2828

29-
val kotlinLoggingVersion: String by rootProject
30-
val kotlinxSerializationVersion: String by rootProject
31-
3229
kotlin {
3330
jvm()
3431
js(IR) {
@@ -45,8 +42,8 @@ kotlin {
4542
val commonMain by getting {
4643
dependencies {
4744
implementation(kotlin("stdlib-common"))
48-
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
49-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion")
45+
implementation(libs.kotlin.logging)
46+
implementation(libs.kotlin.serialization.json)
5047
}
5148
}
5249
val commonTest by getting {

‎model-client/build.gradle.kts‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ kotlin {
4949
api(project(":model-api"))
5050
api(project(":model-server-api"))
5151
kotlin("stdlib-common")
52-
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4")
53-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
54-
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
55-
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
56-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion")
57-
implementation("io.ktor:ktor-client-core:$ktorVersion")
58-
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
59-
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
52+
implementation(libs.kotlin.collections.immutable)
53+
implementation(libs.kotlin.coroutines.core)
54+
implementation(libs.kotlin.logging)
55+
implementation(libs.kotlin.datetime)
56+
implementation(libs.kotlin.serialization.json)
57+
implementation(libs.ktor.client.core)
58+
implementation(libs.ktor.client.content.negotiation)
59+
implementation(libs.ktor.serialization.json)
6060
}
6161
}
6262
val commonTest by getting {
@@ -69,27 +69,22 @@ kotlin {
6969
dependencies {
7070
kotlin("stdlib-jdk8")
7171

72-
implementation("io.vavr:vavr:0.10.3")
73-
implementation("org.apache.commons:commons-lang3:3.11")
74-
implementation("com.google.guava:guava:29.0-jre")
75-
implementation("org.glassfish.jersey.core:jersey-client:2.31")
76-
implementation("org.glassfish.jersey.inject:jersey-hk2:2.31")
77-
implementation("org.glassfish.jersey.media:jersey-media-sse:2.31")
78-
implementation("javax.xml.bind:jaxb-api:2.3.1")
79-
implementation("commons-io:commons-io:2.7")
72+
implementation(libs.vavr)
73+
implementation(libs.apache.commons.lang)
74+
implementation(libs.guava)
75+
implementation(libs.apache.commons.io)
8076
implementation("org.json:json:20200518")
81-
implementation("net.sf.trove4j:trove4j:3.0.3")
82-
implementation("org.apache.commons:commons-collections4:4.4")
77+
implementation(libs.trove4j)
78+
implementation(libs.apache.commons.collections)
8379

84-
val oauthVersion = "1.34.1"
85-
implementation("com.google.oauth-client:google-oauth-client:$oauthVersion")
86-
implementation("com.google.oauth-client:google-oauth-client-jetty:$oauthVersion")
80+
implementation("com.google.oauth-client:google-oauth-client:1.34.1")
81+
implementation("com.google.oauth-client:google-oauth-client-jetty:1.34.1")
8782

88-
implementation("io.ktor:ktor-client-core:$ktorVersion")
89-
implementation("io.ktor:ktor-client-cio:$ktorVersion")
90-
implementation("io.ktor:ktor-client-auth:$ktorVersion")
91-
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
92-
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
83+
implementation(libs.ktor.client.core)
84+
implementation(libs.ktor.client.cio)
85+
implementation(libs.ktor.client.auth)
86+
implementation(libs.ktor.client.content.negotiation)
87+
implementation(libs.ktor.serialization.json)
9388
}
9489
}
9590
val jvmTest by getting {

0 commit comments

Comments
 (0)