Move funcTest sources back

Author: Goooler

build.gradle.kts

@@ -2,11 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-  alias(libs.plugins.kotlin)
+  alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.android.lint)
   alias(libs.plugins.jetbrains.bcv)
   alias(libs.plugins.spotless)
-  groovy // Required for Spock tests.
   id("shadow.convention.publish")
   id("shadow.convention.deploy")
 }
@@ -54,15 +53,12 @@ val intiTestRuntimeOnly: Configuration by configurations.getting {
 val funcTest: SourceSet by sourceSets.creating
 val funcTestImplementation: Configuration by configurations.getting {
   extendsFrom(configurations.testImplementation.get())
-  // TODO: this will be removed after we migrated all functional tests to Kotlin.
-  extendsFrom(intiTestImplementation)
 }
 val funcTestRuntimeOnly: Configuration by configurations.getting {
   extendsFrom(configurations.testRuntimeOnly.get())
 }
 
 gradlePlugin {
-  testSourceSets.add(intiTest)
   testSourceSets.add(funcTest)
 }
 
@@ -80,23 +76,12 @@ dependencies {
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.assertk)
   testImplementation(libs.xmlunit)
-  testImplementation(libs.apache.commonsLang)
   testRuntimeOnly(libs.junit.platformLauncher)
 
-  funcTestImplementation(libs.spock) {
-    exclude(group = "org.codehaus.groovy")
-    exclude(group = "org.hamcrest")
-  }
   funcTestImplementation(sourceSets.main.get().output)
-  funcTestImplementation(intiTest.output)
-
-  intiTestImplementation(libs.okio)
-  intiTestImplementation(libs.apache.maven.modelBuilder)
-  intiTestImplementation(libs.apache.maven.repositoryMetadata)
-  // TODO: this will be removed after we migrated all functional tests to Kotlin.
-  intiTestImplementation(sourceSets.main.get().output)
-  intiTestImplementation(libs.moshi)
-  intiTestImplementation(libs.moshi.kotlin)
+  funcTestImplementation(libs.apache.maven.modelBuilder)
+  funcTestImplementation(libs.moshi)
+  funcTestImplementation(libs.moshi.kotlin)
 
   lintChecks(libs.androidx.gradlePluginLints)
   lintChecks(libs.assertk.lint)
@@ -108,10 +93,6 @@ val integrationTest by tasks.registering(Test::class) {
   testClassesDirs = intiTest.output.classesDirs
   classpath = intiTest.runtimeClasspath
 
-  // TODO: this should be moved into functionalTest after we migrated all functional tests to Kotlin.
-  // Required to enable `IssueExtension` for all tests.
-  systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
-
   val docsDir = file("src/docs")
   // Add src/docs as an input directory to trigger ManualCodeSnippetTests re-run on changes.
   inputs.dir(docsDir)
@@ -123,6 +104,9 @@ val functionalTest by tasks.registering(Test::class) {
   group = LifecycleBasePlugin.VERIFICATION_GROUP
   testClassesDirs = funcTest.output.classesDirs
   classpath = funcTest.runtimeClasspath
+
+  // Required to enable `IssueExtension` for all tests.
+  systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
 }
 
 tasks.check {

gradle/libs.versions.toml

@@ -1,21 +1,17 @@
 [versions]
-maven = "3.9.9"
 moshi = "1.15.2"
 
 [libraries]
 apache-ant = "org.apache.ant:ant:1.10.15"
 apache-commonsIo = "commons-io:commons-io:2.18.0"
-apache-commonsLang = "org.apache.commons:commons-lang3:3.17.0"
 apache-log4j = "org.apache.logging.log4j:log4j-core:2.24.3"
-apache-maven-modelBuilder = { module = "org.apache.maven:maven-model-builder", version.ref = "maven" }
-apache-maven-repositoryMetadata = { module = "org.apache.maven:maven-repository-metadata", version.ref = "maven" }
+apache-maven-modelBuilder = "org.apache.maven:maven-model-builder:3.9.9"
 asm = "org.ow2.asm:asm-commons:9.7.1"
 jdependency = "org.vafer:jdependency:2.11"
 jdom2 = "org.jdom:jdom2:2.0.6.1"
 plexus-utils = "org.codehaus.plexus:plexus-utils:4.0.2"
 plexus-xml = "org.codehaus.plexus:plexus-xml:4.0.4"
 xmlunit = "org.xmlunit:xmlunit-legacy:2.10.0"
-okio = "com.squareup.okio:okio:3.10.2"
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
 
@@ -30,14 +26,13 @@ assertk-lint = "com.jzbrooks:assertk-lint:1.4.0"
 # Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.
 ktlint = "com.pinterest.ktlint:ktlint-cli:1.5.0"
 
-spock = "org.spockframework:spock-core:2.3-groovy-3.0"
 junit-bom = "org.junit:junit-bom:5.11.4"
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
 junit-platformLauncher = { module = "org.junit.platform:junit-platform-launcher" }
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
 
 [plugins]
-kotlin = "org.jetbrains.kotlin.jvm:2.1.0"
+kotlin-jvm = "org.jetbrains.kotlin.jvm:2.1.0"
 android-lint = "com.android.lint:8.7.3"
 jetbrains-bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.17.0"
 spotless = "com.diffplug.spotless:7.0.1"