Upgraded to Spring 6.1.0-M5 and Spring Boot 3.2.0-M3. Tested that Kotlin value classes can be used to disambiguate Spring beans.

Author: ianbrandt

build-logic/settings.gradle.kts

@@ -6,6 +6,7 @@ dependencyResolutionManagement {
 	@Suppress("UnstableApiUsage")
 	repositories {
 		gradlePluginPortal()
+		maven { setUrl("https://repo.spring.io/milestone") }
 	}
 	versionCatalogs {
 		create("libs") {

gradle/libs.versions.toml

@@ -14,8 +14,8 @@ kotlinx-datetime = "0.4.1"
 log4j = "2.20.0"
 log4j-kotlin = "1.2.0"
 mockk = "1.13.8"
-spring = "6.0.12"
-spring-boot = "3.1.4"
+spring = "6.1.0-M5"
+spring-boot = "3.2.0-M3"
 spring-mockk = "4.0.2"
 versions-gradle-plugin = "0.48.0"
 

settings.gradle.kts

@@ -1,5 +1,9 @@
 pluginManagement {
 	includeBuild("build-logic")
+	repositories {
+		gradlePluginPortal()
+		maven { setUrl("https://repo.spring.io/milestone") }
+	}
 }
 
 plugins {
@@ -10,6 +14,7 @@ dependencyResolutionManagement {
 	@Suppress("UnstableApiUsage")
 	repositories {
 		mavenCentral()
+		maven { setUrl("https://repo.spring.io/milestone") }
 		maven { setUrl("https://jitpack.io") }
 	}
 }

subprojects/app/src/it/kotlin/org/sdkotlin/springdemo/SpringKotlinValueClassIT.kt

@@ -0,0 +1,67 @@
+package org.sdkotlin.springdemo
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import java.util.function.Supplier
+
+@SpringBootTest
+internal class SpringKotlinValueClassIT {
+
+	@Configuration
+	internal class TestConfig {
+
+		@Bean
+		fun helloFunction(): () -> HelloString =
+			{ HelloString("Hello") }
+
+		@Bean
+		fun worldFunction(): () -> WorldString =
+			{ WorldString("World") }
+
+		@Bean
+		fun helloSupplier(): Supplier<HelloString> =
+			Supplier { HelloString("Hello") }
+
+		@Bean
+		fun worldSupplier(): Supplier<WorldString> =
+			Supplier { WorldString("World") }
+	}
+
+	@Test
+	fun `test Kotlin value class function beans with Spring`(
+		@Autowired
+		helloFunction: () -> HelloString,
+		@Autowired
+		worldFunction: () -> WorldString,
+	) {
+
+		val helloWorld =
+			"${helloFunction().value}, ${worldFunction().value}!"
+
+		assertThat(helloWorld).isEqualTo("Hello, World!")
+	}
+
+	@Test
+	fun `test Kotlin value class Supplier beans with Spring`(
+		@Autowired
+		helloSupplier: Supplier<HelloString>,
+		@Autowired
+		worldSupplier: Supplier<WorldString>,
+	) {
+
+		val helloWorld =
+			"${helloSupplier.get().value}, ${worldSupplier.get().value}!"
+
+		assertThat(helloWorld).isEqualTo("Hello, World!")
+	}
+
+	@JvmInline
+	value class HelloString(val value: String)
+
+	@JvmInline
+	value class WorldString(val value: String)
+}