Skip to content

Commit a0cfb63

Browse files
committed
build: move kotlin and compose versions to catalog
1 parent 8bb28cf commit a0cfb63

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
22

33
plugins {
4-
kotlin("jvm")
5-
kotlin("plugin.compose")
6-
id("org.jetbrains.compose")
4+
alias(libs.plugins.kotlin)
5+
alias(libs.plugins.kotlin.compose)
6+
alias(libs.plugins.compose)
77
`maven-publish`
88
}
99

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
kotlin.code.style=official
3-
kotlin.version=2.0.20
4-
compose.version=1.7.0-beta02

gradle/libs.versions.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kotlinx-coroutines = "1.10.1"
33
lwjgl = "3.3.6"
44
skiko = "0.8.19-egl"
55
jni-utils = "0.1.6"
6+
compose = "1.7.3"
7+
kotlin = "2.1.0"
68

79
[libraries]
810
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -25,6 +27,11 @@ jni-utils = { group = "dev.silenium.libs.jni", name = "jni-utils", version.ref =
2527
slf4j-api = { group = "org.slf4j", name = "slf4j-api", version = "2.0.16" }
2628
logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.16" }
2729

30+
[plugins]
31+
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
32+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
33+
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
34+
2835
[bundles]
2936
kotlinx-coroutines = [
3037
"kotlinx-coroutines-core",

native/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import dev.silenium.libs.jni.NativeLoader
22
import dev.silenium.libs.jni.NativePlatform
33
import dev.silenium.libs.jni.Platform
4-
import org.jetbrains.kotlin.incremental.createDirectory
54

65
buildscript {
76
repositories {
@@ -29,7 +28,7 @@ val platform = platformString?.let(Platform::invoke) ?: NativePlatform.platform(
2928

3029
val cmakeExe = findProperty("cmake.executable") as? String ?: "cmake"
3130
val generateMakefile = tasks.register<Exec>("generateMakefile") {
32-
workingDir = layout.buildDirectory.dir("cmake").get().asFile.apply { createDirectory() }
31+
workingDir = layout.buildDirectory.dir("cmake").get().asFile.apply { mkdirs() }
3332
val additionalFlags = mutableListOf(
3433
"-DJAVA_HOME=${System.getProperty("java.home")}",
3534
"-DPROJECT_NAME=${libName}",

settings.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ pluginManagement {
55
gradlePluginPortal()
66
mavenCentral()
77
}
8-
9-
plugins {
10-
kotlin("jvm").version(extra["kotlin.version"] as String)
11-
id("org.jetbrains.compose").version(extra["compose.version"] as String)
12-
id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String)
13-
}
148
}
159

1610
rootProject.name = "compose-gl"

0 commit comments

Comments
 (0)