Merge branch 'main' into preview

Author: jjohannes

build.gradle.kts

@@ -1,20 +1,16 @@
 plugins {
-    id("groovy")
     id("org.gradlex.internal.plugin-publish-conventions") version "0.6"
 }
 
 group = "org.gradlex"
 version = "1.0.1"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
-dependencies {
-    testImplementation("org.spockframework:spock-core:2.1-groovy-3.0")
-    testImplementation("org.gradle.exemplar:samples-check:1.0.3")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+tasks.compileJava {
+    options.release = 8
 }
 
 pluginPublishConventions {
@@ -31,7 +27,23 @@ pluginPublishConventions {
     }
 }
 
-tasks.test {
-    useJUnitPlatform()
-    maxParallelForks = 4
+testing.suites.named<JvmTestSuite>("test") {
+    useJUnitJupiter()
+    listOf("7.4", "7.6.5", "8.0.2", "8.14.2").forEach { gradleVersionUnderTest ->
+        targets.register("test${gradleVersionUnderTest}") {
+            testTask {
+                group = LifecycleBasePlugin.VERIFICATION_GROUP
+                description = "Runs tests against Gradle $gradleVersionUnderTest"
+                systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
+            }
+        }
+    }
+    dependencies {
+        implementation("org.assertj:assertj-core:3.27.3")
+    }
+    targets.configureEach {
+        testTask {
+            maxParallelForks = 4
+        }
+    }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

gradlew

@@ -19,7 +19,6 @@
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.NamedDomainObjectSet;
-import org.gradle.api.NonNullApi;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
@@ -63,7 +62,6 @@
 import static org.gradle.nativeplatform.OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE;
 import static org.gradle.nativeplatform.OperatingSystemFamily.WINDOWS;
 
-@NonNullApi
 abstract public class JavaModulePackagingExtension {
     private static final Attribute<Boolean> JAVA_MODULE_ATTRIBUTE = Attribute.of("javaModule", Boolean.class);
     private static final String INTERNAL = "internal";

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java

@@ -16,7 +16,6 @@
 
 package org.gradlex.javamodule.packaging;
 
-import org.gradle.api.NonNullApi;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.SourceDirectorySet;
@@ -29,7 +28,6 @@
 import javax.inject.Inject;
 
 @SuppressWarnings("unused")
-@NonNullApi
 public abstract class JavaModulePackagingPlugin implements Plugin<Project> {
 
     @Inject

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright the GradleX team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NullMarked
+package org.gradlex.javamodule.packaging.internal;
+
+import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/javamodule/packaging/internal/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright the GradleX team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NullMarked
+package org.gradlex.javamodule.packaging.model;
+
+import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/javamodule/packaging/model/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright the GradleX team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NullMarked
+package org.gradlex.javamodule.packaging;
+
+import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/javamodule/packaging/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright the GradleX team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NullMarked
+package org.gradlex.javamodule.packaging.tasks;
+
+import org.jspecify.annotations.NullMarked;