Adjust to changes in names and test setup

Author: jjohannes

build.gradle.kts

@@ -15,17 +15,18 @@ dependencies {
     compileOnly("com.autonomousapps:dependency-analysis-gradle-plugin:3.1.0")
 }
 
-pluginPublishConventions {
-    id("${project.group}.${project.name}")
-    implementationClass("org.gradlex.javamodule.dependencies.JavaModuleDependenciesPlugin")
-    displayName("Java Module Dependencies Gradle Plugin")
-    description("A plugin that makes Gradle respect the dependencies defined in 'module-info.java' files.")
-    additionalPlugin("${project.group}.java-module-versions") {
+publishingConventions {
+    pluginPortal("${project.group}.${project.name}") {
+        implementationClass("org.gradlex.javamodule.dependencies.JavaModuleDependenciesPlugin")
+        displayName("Java Module Dependencies Gradle Plugin")
+        description("A plugin that makes Gradle respect the dependencies defined in 'module-info.java' files.")
+        tags("gradlex", "java", "modularity", "jigsaw", "jpms", "dependencies", "versions")
+    }
+    pluginPortal("${project.group}.java-module-versions") {
         implementationClass("org.gradlex.javamodule.dependencies.JavaModuleVersionsPlugin")
         displayName("Java Module Versions Gradle Plugin")
         description("A plugin that makes Gradle respect the dependencies defined in 'module-info.java' files.")
     }
-    tags("gradlex", "java", "modularity", "jigsaw", "jpms", "dependencies", "versions")
     gitHub("https://github.com/gradlex-org/java-module-dependencies")
     developer {
         id.set("jjohannes")

settings.gradle.kts

@@ -1,5 +1,5 @@
-pluginManagement { includeBuild("build/plugin-publish-conventions") }
+pluginManagement { includeBuild("build/internal-build-conventions") }
 
-plugins { id("org.gradlex.internal.gradlex-build-conventions") version "0.7" }
+plugins { id("org.gradlex.internal-build-conventions") version "0.7" }
 
 rootProject.name = "java-module-dependencies"

src/test/java/org/gradlex/testing/NoCrossVersion.java

@@ -4,12 +4,9 @@
 import org.gradle.exemplar.test.runner.SampleModifiers;
 import org.gradle.exemplar.test.runner.SamplesRoot;
 import org.gradle.exemplar.test.runner.SamplesRunner;
-import org.gradlex.testing.NoCrossVersion;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 @RunWith(SamplesRunner.class)
 @SamplesRoot("samples")
 @SampleModifiers(PluginBuildLocationSampleModifier.class)
-@Category(NoCrossVersion.class)
 public class SamplesTest {}