diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts index 4ea958ba..f9c38731 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts @@ -1,6 +1,5 @@ package org.openrndr.extra.convention -import gradle.kotlin.dsl.accessors._e1ec756838cb41004a28483270a62877.publishing import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -92,8 +91,8 @@ if (shouldPublish) { } } pom { - name.set("$project.name") - description.set("$project.name") + name.set(project.name) + description.set(project.name) url.set("https://openrndr.org") developers { developer { diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index e448a44c..dae7a2b1 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -112,12 +112,12 @@ if (shouldPublish) { this as MavenPublication versionMapping { allVariants { - fromResolutionOf("allSourceSetsRuntimeDependenciesMetadata") + fromResolutionOf("commonMainApiDependenciesMetadata") } } pom { - name.set("$project.name") - description.set("$project.name") + name.set(project.name) + description.set(project.name) url.set("https://openrndr.org") developers { developer { diff --git a/gradle.properties b/gradle.properties index 38a20e4d..c12fd848 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,6 @@ kotlin.code.style=official # For optimal compilation performance org.gradle.jvmargs=-Xmx2G -XX:+UseParallelGC -# Enable compatibility with non-hierarchical projects -# https://kotlinlang.org/docs/multiplatform-hierarchy.html#for-library-authors -kotlin.mpp.enableCompatibilityMetadataVariant=true kotlin.incremental.multiplatform=true # https://kotlinlang.org/docs/gradle.html#check-for-jvm-target-compatibility-of-related-compile-tasks kotlin.jvm.target.validation.mode=error diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b788e58..384515da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlinApi = "1.8" kotlinLanguage = "1.8" -kotlin = "1.8.10" +kotlin = "1.8.20" jvmTarget = "11" openrndr = { require = "[0.4.2, 0.5.0)" } kotlinxCoroutines = "1.6.4"