Upgrade to Kotlin 1.8.20

This commit is contained in:
Edwin Jakobs
2023-04-03 16:04:19 +02:00
parent 051da62740
commit 9610dc2dea
4 changed files with 6 additions and 10 deletions

View File

@@ -1,6 +1,5 @@
package org.openrndr.extra.convention package org.openrndr.extra.convention
import gradle.kotlin.dsl.accessors._e1ec756838cb41004a28483270a62877.publishing
import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -92,8 +91,8 @@ if (shouldPublish) {
} }
} }
pom { pom {
name.set("$project.name") name.set(project.name)
description.set("$project.name") description.set(project.name)
url.set("https://openrndr.org") url.set("https://openrndr.org")
developers { developers {
developer { developer {

View File

@@ -112,12 +112,12 @@ if (shouldPublish) {
this as MavenPublication this as MavenPublication
versionMapping { versionMapping {
allVariants { allVariants {
fromResolutionOf("allSourceSetsRuntimeDependenciesMetadata") fromResolutionOf("commonMainApiDependenciesMetadata")
} }
} }
pom { pom {
name.set("$project.name") name.set(project.name)
description.set("$project.name") description.set(project.name)
url.set("https://openrndr.org") url.set("https://openrndr.org")
developers { developers {
developer { developer {

View File

@@ -3,9 +3,6 @@
kotlin.code.style=official kotlin.code.style=official
# For optimal compilation performance # For optimal compilation performance
org.gradle.jvmargs=-Xmx2G -XX:+UseParallelGC 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 kotlin.incremental.multiplatform=true
# https://kotlinlang.org/docs/gradle.html#check-for-jvm-target-compatibility-of-related-compile-tasks # https://kotlinlang.org/docs/gradle.html#check-for-jvm-target-compatibility-of-related-compile-tasks
kotlin.jvm.target.validation.mode=error kotlin.jvm.target.validation.mode=error

View File

@@ -1,7 +1,7 @@
[versions] [versions]
kotlinApi = "1.8" kotlinApi = "1.8"
kotlinLanguage = "1.8" kotlinLanguage = "1.8"
kotlin = "1.8.10" kotlin = "1.8.20"
jvmTarget = "11" jvmTarget = "11"
openrndr = { require = "[0.4.2, 0.5.0)" } openrndr = { require = "[0.4.2, 0.5.0)" }
kotlinxCoroutines = "1.6.4" kotlinxCoroutines = "1.6.4"