Skip to content

Commit

Permalink
migrated to toml version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabmax
fabmax committed Mar 24, 2024
1 parent eb4a6a3 commit f7cf161
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 116 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
alias(commonLibs.plugins.androidApplication) apply false
alias(commonLibs.plugins.androidLibrary) apply false
alias(commonLibs.plugins.kotlinMultiplatform) apply false
alias(commonLibs.plugins.kotlinSerialization) apply false
alias(commonLibs.plugins.kotlinAtomicFu) apply false
alias(commonLibs.plugins.kotlinDokka) apply false
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.kotlinSerialization) apply false
alias(libs.plugins.kotlinAtomicFu) apply false
alias(libs.plugins.kotlinDokka) apply false
}

allprojects {
Expand Down
38 changes: 38 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[versions]
agp = "8.1.4"
kotlin = "2.0.0-Beta5"
kotlin-coroutines = "1.8.0"
kotlin-serialization = "1.6.3"
kotlin-atomicfu = "0.23.2"
kotlin-dokka = "1.9.20"
lwjgl = "3.3.3"
jsvg = "1.4.0"
physxjni = "2.3.2"

[libraries]
kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
kotlin-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlin-serialization" }
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlin-serialization" }
kotlin-atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "kotlin-atomicfu" }
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
jsvg = { group = "com.github.weisj", name = "jsvg", version.ref = "jsvg" }
lwjgl-core = { group = "org.lwjgl", name = "lwjgl", version.ref = "lwjgl" }
lwjgl-glfw = { group = "org.lwjgl", name = "lwjgl-glfw", version.ref = "lwjgl" }
lwjgl-jemalloc = { group = "org.lwjgl", name = "lwjgl-jemalloc", version.ref = "lwjgl" }
lwjgl-opengl = { group = "org.lwjgl", name = "lwjgl-opengl", version.ref = "lwjgl" }
lwjgl-vulkan = { group = "org.lwjgl", name = "lwjgl-vulkan", version.ref = "lwjgl" }
lwjgl-vma = { group = "org.lwjgl", name = "lwjgl-vma", version.ref = "lwjgl" }
lwjgl-shaderc = { group = "org.lwjgl", name = "lwjgl-shaderc", version.ref = "lwjgl" }
lwjgl-nfd = { group = "org.lwjgl", name = "lwjgl-nfd", version.ref = "lwjgl" }
lwjgl-stb = { group = "org.lwjgl", name = "lwjgl-stb", version.ref = "lwjgl" }
physxjni = { group = "de.fabmax", name = "physx-jni", version.ref = "physxjni" }

[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinAtomicFu = { id = "org.jetbrains.kotlin.plugin.atomicfu", version.ref = "kotlin" }
kotlinDokka = { id = "org.jetbrains.dokka", version.ref = "kotlin-dokka" }
58 changes: 29 additions & 29 deletions kool-core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import java.util.*

plugins {
//alias(commonLibs.plugins.androidLibrary)
alias(commonLibs.plugins.kotlinMultiplatform)
alias(commonLibs.plugins.kotlinSerialization)
alias(commonLibs.plugins.kotlinAtomicFu)
alias(commonLibs.plugins.kotlinDokka)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinSerialization)
alias(libs.plugins.kotlinAtomicFu)
alias(libs.plugins.kotlinDokka)

`maven-publish`
signing
Expand Down Expand Up @@ -37,42 +37,42 @@ kotlin {
val desktopTest by getting

commonMain.dependencies {
api(commonLibs.kotlin.coroutines)
implementation(commonLibs.kotlin.serialization.core)
implementation(commonLibs.kotlin.serialization.json)
implementation(commonLibs.kotlin.reflect)
implementation(commonLibs.kotlin.atomicfu)
api(libs.kotlin.coroutines)
implementation(libs.kotlin.serialization.core)
implementation(libs.kotlin.serialization.json)
implementation(libs.kotlin.reflect)
implementation(libs.kotlin.atomicfu)
}

commonTest.dependencies {
implementation(commonLibs.kotlin.test)
implementation(libs.kotlin.test)
}

desktopMain.dependencies {
implementation(jvmLibs.jsvg)
api(jvmLibs.lwjgl.core)
api(jvmLibs.lwjgl.glfw)
api(jvmLibs.lwjgl.jemalloc)
api(jvmLibs.lwjgl.nfd)
api(jvmLibs.lwjgl.opengl)
api(jvmLibs.lwjgl.shaderc)
api(jvmLibs.lwjgl.stb)
api(jvmLibs.lwjgl.vma)
api(jvmLibs.lwjgl.vulkan)
implementation(libs.jsvg)
api(libs.lwjgl.core)
api(libs.lwjgl.glfw)
api(libs.lwjgl.jemalloc)
api(libs.lwjgl.nfd)
api(libs.lwjgl.opengl)
api(libs.lwjgl.shaderc)
api(libs.lwjgl.stb)
api(libs.lwjgl.vma)
api(libs.lwjgl.vulkan)

listOf("natives-linux", "natives-windows", "natives-macos", "natives-macos-arm64").forEach { platform ->
runtimeOnly("${jvmLibs.lwjgl.core.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.stb.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.vma.get()}:$platform")
runtimeOnly("${libs.lwjgl.core.get()}:$platform")
runtimeOnly("${libs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${libs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${libs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${libs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${libs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${libs.lwjgl.stb.get()}:$platform")
runtimeOnly("${libs.lwjgl.vma.get()}:$platform")
}
}
desktopTest.dependencies {
implementation(commonLibs.kotlin.test.junit)
implementation(libs.kotlin.test.junit)
}

jsMain.dependencies {
Expand Down
30 changes: 15 additions & 15 deletions kool-demo/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig

plugins {
alias(commonLibs.plugins.kotlinMultiplatform)
alias(commonLibs.plugins.kotlinSerialization)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinSerialization)
}

kotlin {
Expand All @@ -30,9 +30,9 @@ kotlin {
val desktopMain by getting

commonMain.dependencies {
implementation(commonLibs.kotlin.coroutines)
implementation(commonLibs.kotlin.serialization.core)
implementation(commonLibs.kotlin.serialization.json)
implementation(libs.kotlin.coroutines)
implementation(libs.kotlin.serialization.core)
implementation(libs.kotlin.serialization.json)

implementation(project(":kool-core"))
implementation(project(":kool-physics"))
Expand All @@ -44,20 +44,20 @@ kotlin {
// Notice that runtimeLibs are only available and added to classpath after first build (or after
// cacheRuntimeLibs task is executed manually) AND the gradle project is re-synced.
implementation(fileTree("${projectDir}/runtimeLibs") { include("*.jar") })
implementation(jvmLibs.jsvg)
implementation(libs.jsvg)

// add all native libs potentially needed for running demo as runtimeOnly dependencies, so that they can
// be found by the cacheRuntimeLibs task
listOf("natives-linux", "natives-windows", "natives-macos", "natives-macos-arm64").forEach { platform ->
runtimeOnly("${jvmLibs.lwjgl.core.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.stb.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.vma.get()}:$platform")
runtimeOnly("${jvmLibs.physxjni.get()}:$platform")
runtimeOnly("${libs.lwjgl.core.get()}:$platform")
runtimeOnly("${libs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${libs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${libs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${libs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${libs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${libs.lwjgl.stb.get()}:$platform")
runtimeOnly("${libs.lwjgl.vma.get()}:$platform")
runtimeOnly("${libs.physxjni.get()}:$platform")
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions kool-editor/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import java.io.FileInputStream
import java.util.*

plugins {
alias(commonLibs.plugins.kotlinMultiplatform)
alias(commonLibs.plugins.kotlinAtomicFu)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinAtomicFu)
`maven-publish`
signing
}
Expand All @@ -17,11 +17,11 @@ kotlin {

sourceSets {
commonMain.dependencies {
api(commonLibs.kotlin.coroutines)
api(commonLibs.kotlin.serialization.core)
api(commonLibs.kotlin.serialization.json)
api(commonLibs.kotlin.reflect)
api(commonLibs.kotlin.atomicfu)
api(libs.kotlin.coroutines)
api(libs.kotlin.serialization.core)
api(libs.kotlin.serialization.json)
api(libs.kotlin.reflect)
api(libs.kotlin.atomicfu)
api(project(":kool-core"))
api(project(":kool-physics"))
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
Expand All @@ -30,20 +30,20 @@ kotlin {
val desktopTest by getting
desktopTest.dependencies {
implementation(fileTree("${projectDir}/../kool-demo/runtimeLibs") { include("*.jar") })
implementation(jvmLibs.jsvg)
implementation(libs.jsvg)

// add all native libs potentially needed for running demo as runtimeOnly dependencies, so that they can
// be found by the cacheRuntimeLibs task
listOf("natives-linux", "natives-windows", "natives-macos", "natives-macos-arm64").forEach { platform ->
runtimeOnly("${jvmLibs.lwjgl.core.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.stb.get()}:$platform")
runtimeOnly("${jvmLibs.lwjgl.vma.get()}:$platform")
runtimeOnly("${jvmLibs.physxjni.get()}:$platform")
runtimeOnly("${libs.lwjgl.core.get()}:$platform")
runtimeOnly("${libs.lwjgl.glfw.get()}:$platform")
runtimeOnly("${libs.lwjgl.jemalloc.get()}:$platform")
runtimeOnly("${libs.lwjgl.nfd.get()}:$platform")
runtimeOnly("${libs.lwjgl.opengl.get()}:$platform")
runtimeOnly("${libs.lwjgl.shaderc.get()}:$platform")
runtimeOnly("${libs.lwjgl.stb.get()}:$platform")
runtimeOnly("${libs.lwjgl.vma.get()}:$platform")
runtimeOnly("${libs.physxjni.get()}:$platform")
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions kool-physics/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import java.io.FileInputStream
import java.util.*

plugins {
alias(commonLibs.plugins.kotlinMultiplatform)
alias(commonLibs.plugins.kotlinDokka)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinDokka)

`maven-publish`
signing
Expand All @@ -18,14 +18,14 @@ kotlin {
sourceSets {
val desktopMain by getting
commonMain.dependencies {
implementation(commonLibs.kotlin.coroutines)
implementation(libs.kotlin.coroutines)
api(project(":kool-core"))
}

desktopMain.dependencies {
api(jvmLibs.physxjni)
api(libs.physxjni)
listOf("natives-linux", "natives-windows", "natives-macos", "natives-macos-arm64").forEach { platform ->
runtimeOnly("${jvmLibs.physxjni.get()}:$platform")
runtimeOnly("${libs.physxjni.get()}:$platform")
}
}

Expand Down
44 changes: 0 additions & 44 deletions settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,6 @@ dependencyResolutionManagement {
mavenLocal()
mavenCentral()
}

versionCatalogs {
create("commonLibs") {
version("agp", "8.1.4")
version("android-compileSdk", "33")
version("android-minSdk", "24")
version("kotlin", "2.0.0-Beta5")
version("kotlin-coroutines", "1.8.0")
version("kotlin-serialization", "1.6.3")
version("kotlin-atomicfu", "0.23.2")
version("kotlin-dokka", "1.9.20")

library("kotlin-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").versionRef("kotlin-coroutines")
library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin")
library("kotlin-serialization-core", "org.jetbrains.kotlinx", "kotlinx-serialization-core").versionRef("kotlin-serialization")
library("kotlin-serialization-json", "org.jetbrains.kotlinx", "kotlinx-serialization-json").versionRef("kotlin-serialization")
library("kotlin-atomicfu", "org.jetbrains.kotlinx", "atomicfu").versionRef("kotlin-atomicfu")
library("kotlin-test", "org.jetbrains.kotlin", "kotlin-test").versionRef("kotlin")
library("kotlin-test-junit", "org.jetbrains.kotlin", "kotlin-test-junit").versionRef("kotlin")

plugin("androidApplication", "com.android.application").versionRef("agp")
plugin("androidLibrary", "com.android.library").versionRef("agp")
plugin("kotlinSerialization", "org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin")
plugin("kotlinMultiplatform", "org.jetbrains.kotlin.multiplatform").versionRef("kotlin")
plugin("kotlinAtomicFu", "org.jetbrains.kotlin.plugin.atomicfu").versionRef("kotlin")
plugin("kotlinDokka", "org.jetbrains.dokka").versionRef("kotlin-dokka")
}

create("jvmLibs") {
version("lwjgl", "3.3.3")

library("jsvg", "com.github.weisj:jsvg:1.4.0")
library("lwjgl-core", "org.lwjgl", "lwjgl").versionRef("lwjgl")
library("lwjgl-glfw", "org.lwjgl", "lwjgl-glfw").versionRef("lwjgl")
library("lwjgl-jemalloc", "org.lwjgl", "lwjgl-jemalloc").versionRef("lwjgl")
library("lwjgl-opengl", "org.lwjgl", "lwjgl-opengl").versionRef("lwjgl")
library("lwjgl-vulkan", "org.lwjgl", "lwjgl-vulkan").versionRef("lwjgl")
library("lwjgl-vma", "org.lwjgl", "lwjgl-vma").versionRef("lwjgl")
library("lwjgl-shaderc", "org.lwjgl", "lwjgl-shaderc").versionRef("lwjgl")
library("lwjgl-nfd", "org.lwjgl", "lwjgl-nfd").versionRef("lwjgl")
library("lwjgl-stb", "org.lwjgl", "lwjgl-stb").versionRef("lwjgl")
library("physxjni", "de.fabmax:physx-jni:2.3.2")
}
}
}

include("kool-core")
Expand Down

0 comments on commit f7cf161

Please sign in to comment.