diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 1bec35e..f5cb871 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,6 +3,9 @@ + + diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 6e6eec1..79ee123 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,6 +1,5 @@ \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index c264799..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/JVMTarget.kt b/buildSrc/src/main/kotlin/JVMTarget.kt index 9538b86..998d081 100644 --- a/buildSrc/src/main/kotlin/JVMTarget.kt +++ b/buildSrc/src/main/kotlin/JVMTarget.kt @@ -24,8 +24,10 @@ fun Project.configureJVMTarget() { plugins.withId("org.jetbrains.kotlin.multiplatform") { the().targets.withType { compilations.all { - compilerOptions.configure { - jvmTarget = JvmTarget.JVM_1_8 + compileTaskProvider.configure { + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } } } } diff --git a/buildSrc/src/main/kotlin/code-generator.gradle.kts b/buildSrc/src/main/kotlin/code-generator.gradle.kts index edd2b42..48abe1e 100644 --- a/buildSrc/src/main/kotlin/code-generator.gradle.kts +++ b/buildSrc/src/main/kotlin/code-generator.gradle.kts @@ -16,9 +16,11 @@ kotlin { explicitApi() target.compilations { create("generationSource") { - compilerOptions.configure { - freeCompilerArgs.add("-Xjvm-default=all") - // TODO: Suppress warnings once KT-8087 hits + compileTaskProvider.configure { + compilerOptions { + freeCompilerArgs.add("-Xjvm-default=all") + // TODO: Suppress warnings once KT-8087 hits + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 53f7362..7796c6c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "2.0.0-Beta1" -kotlinpoet = "1.15.0" -ksp = "2.0.0-Beta1-1.0.14" +kotlin = "2.0.0" +kotlinpoet = "1.17.0" +ksp = "2.0.0-1.0.22" # The compiled binary of codegen.kt we use to compile codegen.kt itself codegen-kt = "main-SNAPSHOT" @@ -15,14 +15,14 @@ codegen-kotlinpoet = { group = "dev.kord.codegen", name = "kotlinpoet", version codegen-ksp = { group = "dev.kord.codegen", name = "ksp", version = "main-20230912.211940-5" } codegen-ksp-processor = { group = "dev.kord.codegen", name = "ksp-processor", version = "main-20230912.211940-7" } -mockk = { group = "io.mockk", name = "mockk", version = "1.13.8" } +mockk = { group = "io.mockk", name = "mockk", version = "1.13.11" } kotlin-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } ksp-plugin = { group = "com.google.devtools.ksp", name = "symbol-processing-gradle-plugin", version.ref = "ksp" } -dokka-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version = "1.9.10" } -maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.25.3" } +dokka-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version = "1.9.20" } +maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.28.0" } -binary-compatibility-validator-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.13.2" } +binary-compatibility-validator-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.15.0-Beta.2" } [bundles] pluginsForBuildSrc = ["kotlin-plugin", "ksp-plugin", "dokka-plugin", "maven-publish-plugin", "binary-compatibility-validator-plugin"]