apply kotlin opinion to plugin projects

build.gradle.kts

@@ -41,14 +41,13 @@ dependencies {
     implementation("com.netflix.nebula:nebula-project-plugin:latest.release")
     implementation("com.netflix.nebula:nebula-release-plugin:latest.release")
     implementation("com.netflix.nebula:nebula-gradle-interop:latest.release")
-    implementation("com.netflix.nebula:gradle-info-plugin:latest.release")
     implementation("org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:1.0.0")
-    implementation(platform("com.fasterxml.jackson:jackson-bom:2.14.+"))
-
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.4.20")
     implementation("com.gradle.publish:plugin-publish-plugin:2.+")
     implementation("org.gradle.plugin:compatibility-plugin:1.+")
     implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.+")
 
+    testImplementation(platform("com.fasterxml.jackson:jackson-bom:2.14.+"))
     testImplementation("com.netflix.nebula:nebula-test:latest.release")
     testImplementation("org.eclipse.jgit:org.eclipse.jgit:7.7.0.202606012155-r")
     testImplementation("org.mock-server:mockserver-netty:5.15.0")
@@ -156,6 +155,10 @@ kotlin {
 }
 tasks.wrapper {
     distributionType = Wrapper.DistributionType.ALL
-    gradleVersion = "9.6.1"
-    distributionSha256Sum = "61ba77b3ff7167e60962763eb4bae79db7120c189b9544358d0ade3c1e712a83"
-}
+    gradleVersion = "9.7.1"
+    distributionSha256Sum = "92c1a136d76b5017732a66d2e0a648ebff00dd3687d8bff0d0047a1bd904fdf2"
+}
+archRules {
+    failureThreshold("MEDIUM")
+    consoleDetailsThreshold("LOW")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ba77b3ff7167e60962763eb4bae79db7120c189b9544358d0ade3c1e712a83
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
+distributionSha256Sum=92c1a136d76b5017732a66d2e0a648ebff00dd3687d8bff0d0047a1bd904fdf2
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy

@@ -32,6 +32,8 @@ import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.jvm.toolchain.JavaToolchainSpec
 import org.gradle.plugin.devel.tasks.ValidatePlugins
 import org.gradle.plugins.signing.Sign
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jspecify.annotations.NullMarked
 
 import javax.inject.Inject
@@ -66,7 +68,7 @@ class NebulaPluginPlugin implements Plugin<Project> {
     private boolean isPluginPublishingValidation
 
     @Inject
-    NebulaPluginPlugin(ProviderFactory providerFactory,Problems problems) {
+    NebulaPluginPlugin(ProviderFactory providerFactory, Problems problems) {
         this.providers = providerFactory
         this.problems = problems
     }
@@ -76,8 +78,8 @@ class NebulaPluginPlugin implements Plugin<Project> {
         project.group = 'com.netflix.nebula'
 
         project.afterEvaluate {
-            if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks")) {
-               Problem problem = problems.reporter.create(NebulaProblems.OSS_SETTINGS) {
+            if (!project.pluginManager.hasPlugin("com.netflix.nebula.locks")) {
+                Problem problem = problems.reporter.create(NebulaProblems.OSS_SETTINGS) {
                     it.details("locking convention is not found. using com.netflix.nebula.plugin-plugin without the oss.settings plugin is deprecated")
                     it.solution("apply the 'com.netflix.nebula.oss.settings' plugin in settings.gradle.kts")
                 }
@@ -202,6 +204,12 @@ class NebulaPluginPlugin implements Plugin<Project> {
             }
         }
 
+        project.pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+            KotlinJvmExtension kotlin = project.extensions.findByType(KotlinJvmExtension)
+            kotlin.compilerOptions.languageVersion.set(KotlinVersion.KOTLIN_2_1)
+            kotlin.compilerOptions.apiVersion.set(KotlinVersion.KOTLIN_2_1)
+        }
+
         project.afterEvaluate {
             TaskProvider validatePluginsTask = project.tasks.named('validatePlugins')
             TaskProvider publishPluginsTask = project.tasks.named('publishPlugins')

src/main/java/nebula/plugin/plugin/NebulaProblems.java

@@ -2,16 +2,18 @@
 
 import org.gradle.api.problems.ProblemGroup;
 import org.gradle.api.problems.ProblemId;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Constants for Problem reporting
  */
+@NullMarked
 public class NebulaProblems {
 
     public static final ProblemGroup NEBULA_GROUP =
             ProblemGroup.create("com.netflix.nebula", "Nebula Plugins");
 
     public static final ProblemId OSS_SETTINGS = ProblemId.create(
             "com.netflix.nebula.oss.settings not found",
             "using a nebula convention plugin without com.netflix.nebula.oss.settings is deprecated",
             NEBULA_GROUP);

src/test/kotlin/com/netflix/nebula/convention/DependencyLockingPluginTest.kt

@@ -3,7 +3,6 @@ package com.netflix.nebula.convention
 import com.netflix.nebula.SupportedGradleVersion
 import nebula.test.dsl.*
 import nebula.test.dsl.TestKitAssertions.assertThat
-import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
@@ -27,13 +26,15 @@ class DependencyLockingPluginTest {
                     java()
                     id("com.netflix.nebula.locks")
                 }
-                repositories{
+                repositories {
                     mavenCentral()
                 }
-                dependencies("""implementation("org.slf4j:slf4j-api:2.0.18")""")
+                dependencies {
+                    implementation("org.slf4j:slf4j-api:2.0.18")
+                }
             }
         }
-        val result = runner.run(":sub1:dependencies", "--write-locks"){
+        val result = runner.run(":sub1:dependencies", "--write-locks") {
             withGradle(gradle.version)
         }
         assertThat(result)
@@ -65,13 +66,13 @@ class DependencyLockingPluginTest {
                     id("com.netflix.nebula.archrules.runner")
                     id("com.netflix.nebula.locks")
                 }
-                repositories{
+                repositories {
                     mavenCentral()
                 }
-                dependencies(
-                    """implementation("org.slf4j:slf4j-api:2.0.18")""",
-                    """archRules("com.netflix.nebula:archrules-deprecation:1.0.2")"""
-                )
+                dependencies {
+                    implementation("org.slf4j:slf4j-api:2.0.18")
+                    add("archRules", "com.netflix.nebula:archrules-deprecation:latest.release")
+                }
             }
         }
         val result = runner.run(":sub1:dependencies", "--write-locks")
@@ -86,7 +87,8 @@ class DependencyLockingPluginTest {
             .contains("org.slf4j:slf4j-api")
             .contains("mainArchRulesRuntime")
             .contains("testArchRulesRuntime")
-            .contains("com.netflix.nebula:archrules-deprecation:1.0.2=mainArchRulesRuntime,testArchRulesRuntime")
+            .contains("com.netflix.nebula:archrules-deprecation:")
+            .contains("=mainArchRulesRuntime,testArchRulesRuntime")
             .contains("empty=annotationProcessor,testAnnotationProcessor")
     }
 }

src/test/kotlin/nebula/plugin/plugin/ArtifactoryMock.kt

@@ -4,6 +4,14 @@ import org.mockserver.integration.ClientAndServer
 import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
 
+fun expectPublication(mockServer: ClientAndServer, path: String): (ClientAndServer) -> Unit {
+        val request = request(path).withMethod("PUT")
+        mockServer
+            .`when`(request)
+            .respond { response().withStatusCode(200) }
+     return   {it.verify(request) }
+}
+
 fun expectPublicationWithChecksums(mockServer: ClientAndServer, path: String): List<(ClientAndServer) -> Unit> {
     val verifications = mutableListOf<(ClientAndServer) -> Unit>()
     val paths = listOf(
@@ -14,18 +22,13 @@ fun expectPublicationWithChecksums(mockServer: ClientAndServer, path: String): L
         "$path.sha512"
     )
     paths.forEach {
-        val request = request(it).withMethod("PUT")
-        mockServer
-            .`when`(request)
-            .respond { response().withStatusCode(200) }
-        verifications.add { it.verify(request) }
+        verifications.add(expectPublication(mockServer, it))
     }
     return verifications
 }
 
 fun expectSignedPublicationWithChecksums(mockServer: ClientAndServer, path: String): List<(ClientAndServer) -> Unit> {
-    return expectPublicationWithChecksums(mockServer, path) +
-            expectPublicationWithChecksums(mockServer, "$path.asc")
+    return expectPublicationWithChecksums(mockServer, path) + expectPublication(mockServer, "$path.asc")
 }
 
 class Publication(

src/test/kotlin/nebula/plugin/plugin/NebulaPluginPluginTest.kt

@@ -1,12 +1,15 @@
 package nebula.plugin.plugin
 
+import com.netflix.nebula.SupportedGradleVersion
 import nebula.test.dsl.*
 import nebula.test.dsl.TestKitAssertions.assertThat
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.EnumSource
 import org.mockserver.configuration.ConfigurationProperties
 import org.mockserver.integration.ClientAndServer
 import java.io.File
@@ -39,13 +42,15 @@ internal class NebulaPluginPluginTest {
         artifactory.stop()
     }
 
-    private fun TestProjectBuilder.sampleSinglePluginSetup(config: ProjectBuilder.() -> Unit = {
-        src {
-            main {
-                java("example/MyPlugin.java", SAMPLE_JAVA_PLUGIN)
+    private fun TestProjectBuilder.sampleSinglePluginSetup(
+        config: ProjectBuilder.() -> Unit = {
+            src {
+                main {
+                    java("example/MyPlugin.java", SAMPLE_JAVA_PLUGIN)
+                }
             }
         }
-    }) {
+    ) {
         properties {
             configurationCache(true)
             buildCache(true)
@@ -107,7 +112,7 @@ gradlePlugin {
     @Test
     fun `test archrules integration`() {
         val runner = testProject(projectDir) {
-            sampleSinglePluginSetup{
+            sampleSinglePluginSetup {
                 src {
                     main {
                         java("example/MyPlugin.java", SAMPLE_JAVA_PLUGIN_WITH_ARCHRULES_FAILURE)
@@ -135,7 +140,7 @@ gradlePlugin {
     @Test
     fun `test setup with settings plugin`() {
         val runner = testProject(projectDir) {
-            settings{
+            settings {
                 plugins {
                     id("com.netflix.nebula.oss.settings")
                 }
@@ -144,8 +149,8 @@ gradlePlugin {
         }
 
         val result = runner.run("check", "--stacktrace")
-assertThat(result)
-    .hasNoProblemsReport()
+        assertThat(result)
+            .hasNoProblemsReport()
             .hasNoDeprecationWarnings()
             .hasNoMutableStateWarnings()
     }
@@ -324,4 +329,27 @@ assertThat(result)
             .content()
             .contains("""<groupId>override</groupId>""")
     }
+
+    @ParameterizedTest
+    @EnumSource(SupportedGradleVersion::class)
+    fun `test kotlin setup`(gradle : SupportedGradleVersion) {
+        val runner = testProject(projectDir) {
+            sampleSinglePluginSetup {
+                plugins {
+                    id("org.jetbrains.kotlin.jvm")
+                }
+                src {
+                    main {
+                        kotlin("example/MyPlugin.kt", SAMPLE_KOTLIN_PLUGIN)
+                    }
+                }
+            }
+        }
+        val result = runner.run("build", "--stacktrace"){
+            withGradle(gradle.version)
+        }
+
+        assertThat(result.task(":compileKotlin"))
+            .hasOutcome(TaskOutcome.SUCCESS)
+    }
 }

src/test/kotlin/nebula/plugin/plugin/SampleCode.kt

@@ -37,6 +37,23 @@ public class MyPlugin implements Plugin<Project> {
 }
 """
 
+//language=kotlin
+const val SAMPLE_KOTLIN_PLUGIN: String = """
+package example
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+* 
+*/
+class MyPlugin : Plugin<Project> {
+    @Override
+    override fun apply(project: Project) {
+    }
+}
+"""
+
 //language=java
 const val SAMPLE_JAVA_MAIN_CLASS: String = """
 package example;