diff --git a/.github/actions/prepare-environment/action.yml b/.github/actions/prepare-environment/action.yml index e23595052..6dddfd9bb 100644 --- a/.github/actions/prepare-environment/action.yml +++ b/.github/actions/prepare-environment/action.yml @@ -22,12 +22,6 @@ inputs: runs: using: "composite" steps: - - name: "🔧 Setup Java 11" - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - if: runner.os == 'Windows' - name: "🔧 Install GraalVM (JDK${{ inputs.java-version }})" uses: graalvm/setup-graalvm@main with: diff --git a/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.java.gradle.kts b/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.java.gradle.kts index 7d09f21f0..79691532a 100644 --- a/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.java.gradle.kts +++ b/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.java.gradle.kts @@ -51,7 +51,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } withJavadocJar() withSourcesJar() @@ -74,11 +74,6 @@ extensions.findByType()?.also { catalogs -> } tasks.javadoc { - // Use a different toolchain version from the compilation - // so that we can generate HTML5 docs - javadocTool.set(javaToolchains.javadocToolFor { - languageVersion.set(JavaLanguageVersion.of(11)) - }) (options as StandardJavadocDocletOptions).addBooleanOption("html5", true) (options as StandardJavadocDocletOptions).noTimestamp(true) } diff --git a/docs/src/docs/asciidoc/changelog.adoc b/docs/src/docs/asciidoc/changelog.adoc index 7adb93a9b..816b1621d 100644 --- a/docs/src/docs/asciidoc/changelog.adoc +++ b/docs/src/docs/asciidoc/changelog.adoc @@ -1,6 +1,10 @@ [[changelog]] == Changelog +== Release 0.11.0 + +This version introduces a breaking change: the plugin now requires Java 17 to run. + == Release 0.10.6 === Gradle plugin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80e42d905..8ba4aed49 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Project versions -nativeBuildTools = "0.10.7-SNAPSHOT" +nativeBuildTools = "0.11.0-SNAPSHOT" metadataRepository = "0.3.18" # External dependencies diff --git a/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/ClasspathJarTest.groovy b/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/ClasspathJarTest.groovy index 08f759f95..394426ab3 100644 --- a/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/ClasspathJarTest.groovy +++ b/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/ClasspathJarTest.groovy @@ -65,7 +65,7 @@ class ClasspathJarTest extends AbstractPluginTest { classpathJar.copy() then: - try (def fs = FileSystems.newFileSystem(jarPath, null)) { + try (def fs = FileSystems.newFileSystem(jarPath, (ClassLoader) null)) { assert Files.exists(fs.getPath("dummy.txt")) } } diff --git a/native-maven-plugin/build.gradle.kts b/native-maven-plugin/build.gradle.kts index 17042cd21..59e547bac 100644 --- a/native-maven-plugin/build.gradle.kts +++ b/native-maven-plugin/build.gradle.kts @@ -154,7 +154,7 @@ val prepareMavenLocalRepo = tasks.register("prepareMavenLocalRepo") { } val launcher = javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } tasks { diff --git a/native-maven-plugin/reproducers/issue-144/pom.xml b/native-maven-plugin/reproducers/issue-144/pom.xml index a64e06846..84ad1b124 100644 --- a/native-maven-plugin/reproducers/issue-144/pom.xml +++ b/native-maven-plugin/reproducers/issue-144/pom.xml @@ -56,8 +56,8 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/native-maven-plugin/reproducers/issue-612/pom.xml b/native-maven-plugin/reproducers/issue-612/pom.xml index 2ea9b84d6..5e613c5b4 100644 --- a/native-maven-plugin/reproducers/issue-612/pom.xml +++ b/native-maven-plugin/reproducers/issue-612/pom.xml @@ -50,7 +50,7 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/ArtifactAdapterResolver.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/ArtifactAdapterResolver.java index ae3f57647..96218d2eb 100644 --- a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/ArtifactAdapterResolver.java +++ b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/ArtifactAdapterResolver.java @@ -512,7 +512,7 @@ private static Plugin getShadePluginIfUsed(MavenProject mavenProject) { private static FileSystem getOrCreateFileSystem(Path jarPath) throws IOException { try { - return FileSystems.newFileSystem(jarPath, null); + return FileSystems.newFileSystem(jarPath, (ClassLoader) null); } catch (FileSystemAlreadyExistsException e) { /* If the file system already exists, return the existing file system. */ return FileSystems.getFileSystem(jarPath.toUri()); diff --git a/samples/java-application-with-custom-packaging/pom.xml b/samples/java-application-with-custom-packaging/pom.xml index 4d8592e7e..557358ae6 100644 --- a/samples/java-application-with-custom-packaging/pom.xml +++ b/samples/java-application-with-custom-packaging/pom.xml @@ -61,7 +61,7 @@ 3.3.4 org.graalvm.demo.Application netty - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT diff --git a/samples/java-application-with-custom-tests/gradle.properties b/samples/java-application-with-custom-tests/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application-with-custom-tests/gradle.properties +++ b/samples/java-application-with-custom-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application-with-extra-sourceset/gradle.properties b/samples/java-application-with-extra-sourceset/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application-with-extra-sourceset/gradle.properties +++ b/samples/java-application-with-extra-sourceset/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application-with-reflection/gradle.properties b/samples/java-application-with-reflection/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application-with-reflection/gradle.properties +++ b/samples/java-application-with-reflection/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application-with-reflection/pom.xml b/samples/java-application-with-reflection/pom.xml index c68d4e8a9..34e483217 100644 --- a/samples/java-application-with-reflection/pom.xml +++ b/samples/java-application-with-reflection/pom.xml @@ -51,9 +51,9 @@ 1.8 UTF-8 - 5.10.0 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 5.11.0 + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/samples/java-application-with-resources/gradle.properties b/samples/java-application-with-resources/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application-with-resources/gradle.properties +++ b/samples/java-application-with-resources/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application-with-resources/pom.xml b/samples/java-application-with-resources/pom.xml index 95fd47f4c..e178f1265 100644 --- a/samples/java-application-with-resources/pom.xml +++ b/samples/java-application-with-resources/pom.xml @@ -51,9 +51,9 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 5.10.0 - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 5.11.0 + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/samples/java-application-with-tests/gradle.properties b/samples/java-application-with-tests/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application-with-tests/gradle.properties +++ b/samples/java-application-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application-with-tests/pom.xml b/samples/java-application-with-tests/pom.xml index 19b088af7..2a4fcb955 100644 --- a/samples/java-application-with-tests/pom.xml +++ b/samples/java-application-with-tests/pom.xml @@ -51,9 +51,9 @@ 1.8 UTF-8 - 5.10.0 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 5.11.0 + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/samples/java-application/gradle.properties b/samples/java-application/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-application/gradle.properties +++ b/samples/java-application/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-application/pom.xml b/samples/java-application/pom.xml index 2d5e7bb7e..56d99640d 100644 --- a/samples/java-application/pom.xml +++ b/samples/java-application/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/samples/java-library/gradle.properties b/samples/java-library/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/java-library/gradle.properties +++ b/samples/java-library/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/java-library/pom.xml b/samples/java-library/pom.xml index 52acbb800..1078a572c 100644 --- a/samples/java-library/pom.xml +++ b/samples/java-library/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT java-library diff --git a/samples/junit-tests/gradle.properties b/samples/junit-tests/gradle.properties index 543c078cd..c3671e349 100644 --- a/samples/junit-tests/gradle.properties +++ b/samples/junit-tests/gradle.properties @@ -1 +1 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT +native.gradle.plugin.version = 0.11.0-SNAPSHOT diff --git a/samples/junit-tests/pom.xml b/samples/junit-tests/pom.xml index 9cdc96369..2721d2aa0 100644 --- a/samples/junit-tests/pom.xml +++ b/samples/junit-tests/pom.xml @@ -52,8 +52,8 @@ 1.8 UTF-8 5.11.0 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app diff --git a/samples/kotlin-application-with-tests/gradle.properties b/samples/kotlin-application-with-tests/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/kotlin-application-with-tests/gradle.properties +++ b/samples/kotlin-application-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/metadata-repo-integration/gradle.properties b/samples/metadata-repo-integration/gradle.properties index 3b7949655..df499fbd6 100644 --- a/samples/metadata-repo-integration/gradle.properties +++ b/samples/metadata-repo-integration/gradle.properties @@ -1,4 +1,4 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT +native.gradle.plugin.version = 0.11.0-SNAPSHOT h2.version = 2.2.220 netty.version = 4.1.80.Final logback.version = 1.4.4 diff --git a/samples/metadata-repo-integration/pom.xml b/samples/metadata-repo-integration/pom.xml index a72651271..84d9b5bc8 100644 --- a/samples/metadata-repo-integration/pom.xml +++ b/samples/metadata-repo-integration/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT 2.2.220 4.1.108.Final 1.4.12 diff --git a/samples/multi-project-with-tests/gradle.properties b/samples/multi-project-with-tests/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/multi-project-with-tests/gradle.properties +++ b/samples/multi-project-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/multi-project-with-tests/pom.xml b/samples/multi-project-with-tests/pom.xml index 1ef97757b..6d4e1490e 100644 --- a/samples/multi-project-with-tests/pom.xml +++ b/samples/multi-project-with-tests/pom.xml @@ -57,9 +57,9 @@ 1.8 UTF-8 - 5.10.0 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 5.11.0 + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.demo.Application diff --git a/samples/native-config-integration/gradle.properties b/samples/native-config-integration/gradle.properties index 8579077e5..ce2737cfb 100644 --- a/samples/native-config-integration/gradle.properties +++ b/samples/native-config-integration/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.7-SNAPSHOT -junit.jupiter.version = 5.10.0 -junit.platform.version = 1.10.0 +native.gradle.plugin.version = 0.11.0-SNAPSHOT +junit.jupiter.version = 5.11.0 +junit.platform.version = 1.11.0 diff --git a/samples/native-config-integration/pom.xml b/samples/native-config-integration/pom.xml index f0f753688..3af488ee7 100644 --- a/samples/native-config-integration/pom.xml +++ b/samples/native-config-integration/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.7-SNAPSHOT - 0.10.7-SNAPSHOT + 0.11.0-SNAPSHOT + 0.11.0-SNAPSHOT example-app org.graalvm.example.Application diff --git a/test-support/library-with-reflection/build.gradle.kts b/test-support/library-with-reflection/build.gradle.kts index fe59e83e0..c40ee9abf 100644 --- a/test-support/library-with-reflection/build.gradle.kts +++ b/test-support/library-with-reflection/build.gradle.kts @@ -8,7 +8,7 @@ version = "1.5" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } }