Migrate to Version Catalog, bump to Kotlin 1.9.10

build.gradle.kts

@@ -6,16 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath(libs.org.jetbrains.kotlin.gradle.plugin)
+        classpath(libs.com.android.tools.build.gradle)
     }
 }
 
 val versionInfo = versionInfo()
 println("Version:${versionInfo.versionName}, Type:${versionInfo.type}")
 
-rootProject.ext["kotlin_version"] = "1.7.21"
-
 allprojects {
     repositories {
         maven("https://plugins.gradle.org/m2/")

gradle/libs.versions.toml

@@ -0,0 +1,18 @@
+[versions]
+android-gradle-plugin = "7.3.1"
+jogl = "2.3.2"
+kotlin = "1.9.10"
+lwjgl = "3.3.0"
+
+[libraries]
+com-android-tools-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
+org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+org-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+org-jogamp-jogl-all = { module = "org.jogamp.jogl:jogl-all", version.ref = "jogl" }
+org-jogamp-gluegen-rt = { module = "org.jogamp.gluegen:gluegen-rt", version.ref = "jogl" }
+org-lwjgl = { module = "org.lwjgl:lwjgl", version.ref = "lwjgl" }
+org-lwjgl-assimp = { module = "org.lwjgl:lwjgl-assimp", version.ref = "lwjgl" }
+org-lwjgl-openal = { module = "org.lwjgl:lwjgl-openal", version.ref = "lwjgl" }
+org-lwjgl-glfw = { module = "org.lwjgl:lwjgl-glfw", version.ref = "lwjgl" }
+org-lwjgl-stb = { module = "org.lwjgl:lwjgl-stb", version.ref = "lwjgl" }
+org-lwjgl-opengl = { module = "org.lwjgl:lwjgl-opengl", version.ref = "lwjgl" }

kgl-android/build.gradle.kts

@@ -33,10 +33,8 @@ android {
     }
 }
 
-val kotlinVersion = rootProject.ext["kotlin_version"] as String
-
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    implementation(libs.org.jetbrains.kotlin.stdlib)
 
     implementation(project(":kgl"))
 }

kgl-ios/build.gradle.kts

@@ -37,6 +37,10 @@ kotlin {
             iosArm64Main.dependsOn(this)
             iosX64Main.dependsOn(this)
         }
+
+        all {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
     }
 }
 

kgl-jogl/build.gradle.kts

@@ -10,8 +10,8 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
 
-    implementation("org.jogamp.gluegen:gluegen-rt:2.3.2")
-    implementation("org.jogamp.jogl:jogl-all:2.3.2")
+    implementation(libs.org.jogamp.gluegen.rt)
+    implementation(libs.org.jogamp.jogl.all)
 
     implementation(project(":kgl"))
 }

kgl-lwjgl/build.gradle.kts

@@ -7,20 +7,17 @@ repositories {
     mavenCentral()
 }
 
-val lwjglVersion = "3.3.0"
-val kotlinVersion = rootProject.ext["kotlin_version"] as String
-
 version = currentVersion
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-
-    implementation("org.lwjgl:lwjgl:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-assimp:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-glfw:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-openal:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-opengl:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-stb:$lwjglVersion")
+    implementation(libs.org.jetbrains.kotlin.stdlib)
+
+    implementation(libs.org.lwjgl)
+    implementation(libs.org.lwjgl.assimp)
+    implementation(libs.org.lwjgl.glfw)
+    implementation(libs.org.lwjgl.openal)
+    implementation(libs.org.lwjgl.opengl)
+    implementation(libs.org.lwjgl.stb)
 
     implementation(project(":kgl"))
 }

kgl/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
     id("maven-publish")
 }
 
@@ -13,7 +13,7 @@ version = currentVersion
 kotlin {
     jvm()
 
-    js(BOTH) {
+    js {
         browser {
             testTask {} // To run tests with browser.
         }
@@ -84,6 +84,10 @@ kotlin {
 
             appleOnlySourceSets.forEach { it.dependsOn(this) }
         }
+
+        all {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
     }
 }