Merge remote-tracking branch 'origin/main'

Author: ianbrandt

build-logic/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+	id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 dependencyResolutionManagement {

build-logic/src/main/kotlin/org.sdkotlin.buildlogic.test.integration-test-suite.gradle.kts

@@ -1,18 +1,16 @@
 plugins {
-	`jvm-test-suite`
 	kotlin("jvm")
+	id("jvm-test-suite")
 	id("org.sdkotlin.buildlogic.test.unit-test-suite")
 }
 
-val integrationTestSuiteName = "integrationTest"
-
 @Suppress("UnstableApiUsage")
 testing {
 	suites {
 
 		val test by getting(JvmTestSuite::class)
 
-		register<JvmTestSuite>(integrationTestSuiteName) {
+		register<JvmTestSuite>("integrationTest") {
 
 			dependencies {
 				implementation(project())
@@ -24,7 +22,10 @@ testing {
 					setSrcDirs(listOf("$sourcesRootDir/java"))
 				}
 				kotlin {
-					setSrcDirs(listOf("$sourcesRootDir/kotlin"))
+					setSrcDirs(listOf(
+						"$sourcesRootDir/kotlin",
+						"$sourcesRootDir/java",
+					))
 				}
 				resources {
 					setSrcDirs(listOf("$sourcesRootDir/resources"))
@@ -53,9 +54,7 @@ dependencies {
 	// Version catalog not available in precompiled script plugins:
 	// https://github.com/gradle/gradle/issues/15383
 
-	"integrationTestImplementation"(
-		platform("org.sdkotlin.platforms:test-platform")
-	)
+	"integrationTestImplementation"(platform("org.sdkotlin.platforms:test-platform"))
 
 	//"integrationTestImplementation"(libs.assertj.core)
 	"integrationTestImplementation"("org.assertj:assertj-core")

build-logic/src/main/kotlin/org.sdkotlin.buildlogic.test.unit-test-suite.gradle.kts

@@ -1,8 +1,8 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 
 plugins {
-	`java-library`
-	`jvm-test-suite`
+	id("java-library")
+	id("jvm-test-suite")
 }
 
 @Suppress("UnstableApiUsage")

platforms/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+	id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 dependencyResolutionManagement {

settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
 }
 
 plugins {
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+	id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 dependencyResolutionManagement {