Merge pull request #29 from bnorm/bnorm/versions

bnorm · web-flow · commit 0b8a7b484eb2 · 2025-06-29T17:22:07.000-05:00
Move versions to libs.versions.toml
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -0,0 +1,6 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'config:recommended'
+  ]
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,12 +7,12 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
-    kotlin("multiplatform") apply false
-    kotlin("plugin.serialization") apply false
-    kotlin("plugin.compose") apply false
-    id("org.jetbrains.compose") apply false
-    id("org.jetbrains.dokka")
-    id("com.vanniktech.maven.publish")
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.plugin.serialization) apply false
+    alias(libs.plugins.kotlin.plugin.compose) apply false
+    alias(libs.plugins.compose) apply false
+    alias(libs.plugins.dokka)
+    alias(libs.plugins.maven.publish) apply false
 }
 
 dokka {
diff --git a/examples/basic/build.gradle.kts b/examples/basic/build.gradle.kts
@@ -1,9 +1,11 @@
+import org.jetbrains.compose.reload.ComposeHotRun
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.hot.reload)
 }
 
 group = "dev.bnorm.storyboard.example"
@@ -43,3 +45,7 @@ compose {
     resources.publicResClass = true
     desktop.application.mainClass = "Main_desktopKt"
 }
+
+tasks.withType<ComposeHotRun>().configureEach {
+    mainClass.set("Main_desktopKt")
+}
diff --git a/examples/interactive/build.gradle.kts b/examples/interactive/build.gradle.kts
@@ -1,10 +1,13 @@
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.compose.reload.ComposeHotRun
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.serialization")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.serialization)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.hot.reload)
 }
 
 group = "dev.bnorm.storyboard.example"
@@ -20,7 +23,6 @@ kotlin {
     }
 
     sourceSets {
-        val ktor_version = "3.1.1"
         commonMain {
             dependencies {
                 implementation(project(":storyboard"))
@@ -32,20 +34,20 @@ kotlin {
                 implementation(compose.material)
                 implementation(compose.components.resources)
 
-                implementation("io.ktor:ktor-client-core:${ktor_version}")
-                implementation("io.ktor:ktor-client-content-negotiation:${ktor_version}")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:${ktor_version}")
+                implementation(libs.ktor.client)
+                implementation(libs.ktor.client.contentNegotiation)
+                implementation(libs.ktor.serialization.json)
             }
         }
         jvmMain {
             dependencies {
                 implementation(compose.desktop.currentOs)
-                implementation("io.ktor:ktor-client-okhttp:$ktor_version")
+                implementation(libs.ktor.client.engine.okhttp)
             }
         }
         wasmJsMain {
             dependencies {
-                implementation("io.ktor:ktor-client-js:$ktor_version")
+                implementation(libs.ktor.client.engine.js)
             }
         }
     }
@@ -55,3 +57,7 @@ compose {
     resources.publicResClass = true
     desktop.application.mainClass = "Main_desktopKt"
 }
+
+tasks.withType<ComposeHotRun>().configureEach {
+    mainClass.set("Main_desktopKt")
+}
diff --git a/examples/shared/build.gradle.kts b/examples/shared/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
 }
 
 group = "dev.bnorm.storyboard.example"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,29 @@
+[versions]
+antlr-kotlin = "1.0.5"
+compose-jb = "1.8.2"
+kotlin = "2.2.0"
+ktor = "3.2.0"
+
+[plugins]
+antlr-kotlin = { id = "com.strumenta.antlr-kotlin", version.ref = "antlr-kotlin" }
+binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.0" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose-jb" }
+compose-hot-reload = { id = "org.jetbrains.compose.hot-reload", version = "1.0.0-alpha11" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+maven-publish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
+
+[libraries]
+antlr-kotlin-runtime = { module = "com.strumenta:antlr-kotlin-runtime", version.ref = "antlr-kotlin" }
+compose-materialIcons = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
+filekit-compose = { module = "io.github.vinceglb:filekit-compose", version = "0.8.8" }
+kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.1" }
+ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-client-engine-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
+ktor-client-engine-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
+pdfbox = { module = "org.apache.pdfbox:pdfbox", version = "3.0.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,18 +6,6 @@ pluginManagement {
         google()
         gradlePluginPortal()
     }
-
-    plugins {
-        val kotlinVersion = "2.2.0-RC"
-
-        kotlin("multiplatform") version kotlinVersion
-        kotlin("plugin.serialization") version kotlinVersion
-        kotlin("plugin.compose") version kotlinVersion
-        id("org.jetbrains.compose") version "1.8.0"
-        id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
-        id("org.jetbrains.dokka") version "2.0.0"
-        id("com.vanniktech.maven.publish") version "0.32.0"
-    }
 }
 
 dependencyResolutionManagement {
diff --git a/storyboard-easel/build.gradle.kts b/storyboard-easel/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.serialization")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
-    id("com.vanniktech.maven.publish")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.serialization)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.maven.publish)
 }
 
 group = "dev.bnorm.storyboard"
@@ -24,16 +24,16 @@ kotlin {
                 api(project(":storyboard"))
                 implementation(compose.material)
 
-                implementation("org.jetbrains.compose.material:material-icons-core:1.7.3")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
+                implementation(libs.compose.materialIcons)
+                implementation(libs.kotlinx.serialization.json)
             }
         }
 
         jvmMain {
             dependencies {
                 implementation(compose.desktop.currentOs)
-                implementation("io.github.vinceglb:filekit-compose:0.8.8")
-                implementation("org.apache.pdfbox:pdfbox:3.0.1")
+                implementation(libs.filekit.compose)
+                implementation(libs.pdfbox)
             }
         }
     }
diff --git a/storyboard-text/build.gradle.kts b/storyboard-text/build.gradle.kts
@@ -2,12 +2,11 @@ import com.strumenta.antlrkotlin.gradle.AntlrKotlinTask
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
-    id("com.vanniktech.maven.publish")
-
-    id("com.strumenta.antlr-kotlin") version "1.0.5"
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.antlr.kotlin)
 }
 
 group = "dev.bnorm.storyboard"
@@ -23,11 +22,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":storyboard"))
                 implementation(compose.material)
-
-                implementation("de.cketti.unicode:kotlin-codepoints-deluxe:0.7.0")
-                implementation("com.strumenta:antlr-kotlin-runtime:1.0.5")
+                implementation(libs.antlr.kotlin.runtime)
             }
         }
     }
diff --git a/storyboard/build.gradle.kts b/storyboard/build.gradle.kts
@@ -3,11 +3,11 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.compose")
-    id("org.jetbrains.compose")
-    id("org.jetbrains.kotlinx.binary-compatibility-validator")
-    id("com.vanniktech.maven.publish")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.plugin.compose)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.binaryCompatibilityValidator)
+    alias(libs.plugins.maven.publish)
 }
 
 group = "dev.bnorm.storyboard"
@@ -33,7 +33,7 @@ kotlin {
                 api(compose.runtime)
                 api(compose.animation)
 
-                api("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7")
+                api(libs.kotlinx.collections.immutable)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
	`1`	`+import org.gradle.kotlin.dsl.withType`
	`2`	`+import org.jetbrains.compose.reload.ComposeHotRun`
`1`	`3`	`import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl`
`2`	`4`
`3`	`5`	`plugins {`
`4`		`- kotlin("multiplatform")`
`5`		`- kotlin("plugin.serialization")`
`6`		`- kotlin("plugin.compose")`
`7`		`- id("org.jetbrains.compose")`
	`6`	`+ alias(libs.plugins.kotlin.multiplatform)`
	`7`	`+ alias(libs.plugins.kotlin.plugin.serialization)`
	`8`	`+ alias(libs.plugins.kotlin.plugin.compose)`
	`9`	`+ alias(libs.plugins.compose)`
	`10`	`+ alias(libs.plugins.compose.hot.reload)`
`8`	`11`	`}`
`9`	`12`
`10`	`13`	`group = "dev.bnorm.storyboard.example"`
`@@ -20,7 +23,6 @@ kotlin {`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`sourceSets {`
`23`		`- val ktor_version = "3.1.1"`
`24`	`26`	`commonMain {`
`25`	`27`	`dependencies {`
`26`	`28`	`implementation(project(":storyboard"))`
`@@ -32,20 +34,20 @@ kotlin {`
`32`	`34`	`implementation(compose.material)`
`33`	`35`	`implementation(compose.components.resources)`
`34`	`36`
`35`		`- implementation("io.ktor:ktor-client-core:${ktor_version}")`
`36`		`- implementation("io.ktor:ktor-client-content-negotiation:${ktor_version}")`
`37`		`- implementation("io.ktor:ktor-serialization-kotlinx-json:${ktor_version}")`
	`37`	`+ implementation(libs.ktor.client)`
	`38`	`+ implementation(libs.ktor.client.contentNegotiation)`
	`39`	`+ implementation(libs.ktor.serialization.json)`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`	`jvmMain {`
`41`	`43`	`dependencies {`
`42`	`44`	`implementation(compose.desktop.currentOs)`
`43`		`- implementation("io.ktor:ktor-client-okhttp:$ktor_version")`
	`45`	`+ implementation(libs.ktor.client.engine.okhttp)`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`	`wasmJsMain {`
`47`	`49`	`dependencies {`
`48`		`- implementation("io.ktor:ktor-client-js:$ktor_version")`
	`50`	`+ implementation(libs.ktor.client.engine.js)`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`	`}`
`@@ -55,3 +57,7 @@ compose {`
`55`	`57`	`resources.publicResClass = true`
`56`	`58`	`desktop.application.mainClass = "Main_desktopKt"`
`57`	`59`	`}`
	`60`	`+`
	`61`	`+tasks.withType<ComposeHotRun>().configureEach {`
	`62`	`+ mainClass.set("Main_desktopKt")`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("multiplatform")`
`5`		`- kotlin("plugin.serialization")`
`6`		`- kotlin("plugin.compose")`
`7`		`- id("org.jetbrains.compose")`
`8`		`- id("com.vanniktech.maven.publish")`
	`4`	`+ alias(libs.plugins.kotlin.multiplatform)`
	`5`	`+ alias(libs.plugins.kotlin.plugin.serialization)`
	`6`	`+ alias(libs.plugins.kotlin.plugin.compose)`
	`7`	`+ alias(libs.plugins.compose)`
	`8`	`+ alias(libs.plugins.maven.publish)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = "dev.bnorm.storyboard"`
`@@ -24,16 +24,16 @@ kotlin {`
`24`	`24`	`api(project(":storyboard"))`
`25`	`25`	`implementation(compose.material)`
`26`	`26`
`27`		`- implementation("org.jetbrains.compose.material:material-icons-core:1.7.3")`
`28`		`- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")`
	`27`	`+ implementation(libs.compose.materialIcons)`
	`28`	`+ implementation(libs.kotlinx.serialization.json)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`jvmMain {`
`33`	`33`	`dependencies {`
`34`	`34`	`implementation(compose.desktop.currentOs)`
`35`		`- implementation("io.github.vinceglb:filekit-compose:0.8.8")`
`36`		`- implementation("org.apache.pdfbox:pdfbox:3.0.1")`
	`35`	`+ implementation(libs.filekit.compose)`
	`36`	`+ implementation(libs.pdfbox)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`