diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36991363..dac3f693 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - java_version: [11, 17, 21] + java_version: [11, 17, 23] test_config_method: ["DSL", "PROPERTIES", "BASE"] steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 052ee1cc..8182d51f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Supports both `org.jetbrains.dokka` and `org.jetbrains.dokka-javadoc` - If both are applied the javadoc output is published - Removed support for the old `org.jetbrains.dokka-android` plugin +- Support custom Sonatype hosts by providing a `https` url in `SONATYPE_HOST` Gradle property - Remove usages of deprecated Gradle API that is scheduled to be removed in Gradle 9.0 - Raised minimum supported Gradle version - Improve naming of javadoc jars @@ -18,10 +19,10 @@ - Kotlin Gradle Plugin 1.9.20 #### Compatibility tested up to -- JDK 21 -- Gradle 8.10 +- JDK 23 +- Gradle 8.10.2 - Android Gradle Plugin 8.7.0 -- Android Gradle Plugin 8.8.0-alpha09 +- Android Gradle Plugin 8.8.0-alpha05 - Kotlin Gradle Plugin 2.0.20 - Kotlin Gradle Plugin 2.1.0-Beta1 diff --git a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/ProjectSpecRunner.kt b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/ProjectSpecRunner.kt index a46b76e0..dc87f88f 100644 --- a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/ProjectSpecRunner.kt +++ b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/ProjectSpecRunner.kt @@ -187,6 +187,7 @@ private fun ProjectSpec.writeGradleProperties(path: Path, options: TestOptions) buildString { appendLine("org.gradle.vfs.watch=false") appendLine("kotlin.compiler.execution.strategy=in-process") + appendLine("kotlin.jvm.target.validation.mode=ignore") appendLine("kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true") appendLine("org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled") appendLine("org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true") diff --git a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt index f9fe0348..a3c9219e 100644 --- a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt +++ b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt @@ -41,8 +41,8 @@ enum class AgpVersion( // canary channel AGP_8_8( - value = "8.8.0-alpha04", - minGradleVersion = GradleVersion.GRADLE_8_9, + value = "8.8.0-alpha05", + minGradleVersion = GradleVersion.GRADLE_8_10, ), } @@ -68,11 +68,12 @@ enum class GradleVersion( // minimum supported GRADLE_8_5( value = "8.5", + firstUnsupportedJdkVersion = JavaVersion.VERSION_22, ), // stable GRADLE_8_10( - value = "8.10", + value = "8.10.2", ), ;