Prepare for korlibs 6.0.0 (#2278)

buildSrc/src/main/kotlin/korlibs/root/RootKorlibsPlugin.kt

@@ -813,7 +813,6 @@ fun Project.hasBuildGradle() = listOf("build.gradle", "build.gradle.kts").any {
 val Project.isSample: Boolean get() = project.path.startsWith(":samples:") || project.path.startsWith(":korge-sandbox") || project.path.startsWith(":korge-editor") || project.path.startsWith(":korge-starter-kit")
 fun Project.mustAutoconfigureKMM(): Boolean =
     !project.name.startsWith("korge-gradle-plugin") &&
-        project.name != "korge-kotlin-plugin" &&
         project.name != "korge-reload-agent" &&
         project.name != "korge-ipc" &&
         project.name != "korge-kotlin-compiler" &&

gradle/libs.versions.toml

@@ -9,37 +9,33 @@ proguard-gradle = "7.2.2"
 asm = "9.5"
 jgit = "5.13.1.202206130422-r"
 
-kotlin = "2.0.0"
+kotlin = "2.0.20-RC"
 #kotlinx-coroutines = "1.8.1"
 kotlinx-coroutines = "1.9.0-RC"
 kotlinx-serialization = "1.7.0"
 kotlinx-atomicfu = "0.24.0"
 
-korlibs = "6.0.0-beta1"
-#korlibs = "999.0.0.999"
-
 kotlinx-benchmark = "0.4.7"
-dokka = "1.9.10"
+dokka = "1.9.20"
 kover = "0.6.1"
 kover-agent = "1.0.712"
 node = "20.12.1"
-android-build-gradle = "8.2.0"
+android-build-gradle = "8.2.2"
 gson = "2.10.1"
 gradle-publish-plugin = "1.1.0"
 # https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/intellij-coverage-agent/
 
 [libraries]
-korlibs-all = { module = "com.soywiz:korlibs-all", version.ref = "korlibs" }
-korlibs-audio = { module = "com.soywiz:korlibs-audio", version.ref = "korlibs" }
-korlibs-image = { module = "com.soywiz:korlibs-image", version.ref = "korlibs" }
-korlibs-inject = { module = "com.soywiz:korlibs-inject", version.ref = "korlibs" }
-korlibs-template = { module = "com.soywiz:korlibs-template", version.ref = "korlibs" }
-korlibs-time = { module = "com.soywiz:korlibs-time", version.ref = "korlibs" }
-korlibs-serialization = { module = "com.soywiz:korlibs-serialization", version.ref = "korlibs" }
-korlibs-datastructure = { module = "com.soywiz:korlibs-datastructure", version.ref = "korlibs" }
-korlibs-datastructure-core = { module = "com.soywiz:korlibs-datastructure-core", version.ref = "korlibs" }
-korlibs-memory = { module = "com.soywiz:korlibs-memory", version.ref = "korlibs" }
-korlibs-io-stream = { module = "com.soywiz:korlibs-io-stream", version.ref = "korlibs" }
+korlibs-audio = { module = "com.soywiz:korlibs-audio", version = "6.0.0" }
+korlibs-image = { module = "com.soywiz:korlibs-image", version = "6.0.0" }
+korlibs-inject = { module = "com.soywiz:korlibs-inject", version = "6.0.0" }
+korlibs-template = { module = "com.soywiz:korlibs-template", version = "6.0.0" }
+korlibs-time = { module = "com.soywiz:korlibs-time", version = "6.0.0" }
+korlibs-serialization = { module = "com.soywiz:korlibs-serialization", version = "6.0.0" }
+korlibs-datastructure = { module = "com.soywiz:korlibs-datastructure", version = "6.0.0" }
+korlibs-datastructure-core = { module = "com.soywiz:korlibs-datastructure-core", version = "6.0.0" }
+korlibs-memory = { module = "com.soywiz:korlibs-memory", version = "6.0.0" }
+korlibs-io-stream = { module = "com.soywiz:korlibs-io-stream", version = "6.0.0" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -49,6 +45,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 #jsplainobjects = { module = "org.jetbrains.kotlin:js-plain-objects", version.ref = "kotlin" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kover = { module = "org.jetbrains.kotlinx:kover", version.ref = "kover" }
 kover-intellij-agent = { module = "org.jetbrains.intellij.deps:intellij-coverage-agent", version.ref = "kover-agent" }
 jcodec-core = { module = "org.jcodec:jcodec", version.ref = "jcodec" }
@@ -64,6 +61,7 @@ jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
 
 [bundles]
 kotlin-test = ["junit", "kotlin-test", "kotlin-test-junit"]
+korlibs-all = ["korlibs-audio", "korlibs-image", "korlibs-inject", "korlibs-template", "korlibs-time", "korlibs-serialization", "korlibs-datastructure", "korlibs-datastructure-core", "korlibs-memory", "korlibs-io-stream"]
 
 #[plugins]
 #jmh = { id = "me.champeau.jmh", version = "0.6.5" }

korge-core/build.gradle.kts

@@ -11,7 +11,7 @@ project.extensions.extraProperties.properties.apply {
 }
 
 dependencies {
-    commonMainApi(libs.korlibs.all)
+    commonMainApi(libs.bundles.korlibs.all)
     //commonMainApi(libs.korlibs.audio)
     //commonMainApi(libs.korlibs.image)
     //commonMainApi(libs.korlibs.inject)

korge-gradle-plugin/build.gradle.kts

@@ -165,13 +165,13 @@ korlibs.NativeTools.groovyConfigurePublishing(project, false)
 korlibs.NativeTools.groovyConfigureSigning(project)
 
 buildConfig {
-    val project = project(":korge-kotlin-plugin")
+    //val project = project(":korge-kotlin-plugin")
     packageName("korlibs.korge.gradle.plugin")
     //buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${rootProject.extra["kotlin_plugin_id"]}\"")
     buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"com.soywiz.korge.korge-kotlin-plugin\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "\"${project.group}\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_NAME", "\"${project.name}\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "\"${project.version}\"")
+    //buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "\"${project.group}\"")
+    //buildConfigField("String", "KOTLIN_PLUGIN_NAME", "\"${project.name}\"")
+    //buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "\"${project.version}\"")
 }
 
 afterEvaluate {

korge-gradle-plugin/src/main/kotlin/korlibs/korge/gradle/KorgeGradlePluginNew.kt

@@ -1,16 +1,13 @@
 package korlibs.korge.gradle
 
-import com.soywiz.kproject.*
 import korlibs.korge.gradle.targets.*
-import korlibs.korge.kotlin.plugin.*
 import org.gradle.api.*
 
 abstract class KorgeGradleAbstractPlugin(val projectType: ProjectType) : Plugin<Project> {
     override fun apply(project: Project) {
         project.configureAutoVersions()
         project.configureBuildScriptClasspathTasks()
         KorgeGradleApply(project, projectType).apply(includeIndirectAndroid = true)
-        project.plugins.applyOnce(KorgeKotlinCompilerPlugin::class.java)
     }
 }
 

korge-ipc/build.gradle.kts

@@ -59,7 +59,7 @@ korlibs.NativeTools.groovyConfigureSigning(project)
 
 dependencies {
     implementation(libs.kotlinx.coroutines.core)
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
+    implementation(libs.kotlinx.serialization.json)
     //implementation(libs.korlibs.all)
     //implementation(libs.korlibs.datastructure.core)
     //implementation(libs.korlibs.io.stream)