Upgrade to latest versions.

donbeave · donbeave · commit e9721403c87d · 2025-11-01T23:17:27.000+07:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/graphql-datetime-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/graphql-datetime-library-conventions.gradle.kts
@@ -1,13 +1,11 @@
-import org.gradle.kotlin.dsl.`java-library`
-import org.gradle.kotlin.dsl.`maven-publish`
-
 plugins {
     `java-library`
     `maven-publish`
     id("com.tailrocks.maven-publish")
     id("com.tailrocks.signing")
 }
 
+/*
 java {
     withJavadocJar()
     withSourcesJar()
@@ -28,3 +26,4 @@ publishing {
         }
     }
 }
+*/
diff --git a/buildSrc/src/main/kotlin/kotest-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotest-conventions.gradle.kts
@@ -10,5 +10,5 @@ val libs = catalogs.named("libs")
 dependencies {
     testImplementation(libs.findLibrary("kotest.runner.junit").orElseThrow())
     testImplementation(libs.findLibrary("kotest.assertions.core").orElseThrow())
-    testImplementation(libs.findLibrary("kotest.framework.datatest").orElseThrow())
+    //testImplementation(libs.findLibrary("kotest.framework.datatest").orElseThrow())
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 # Libraries
 kotest = "6.0.4"
-kotest-spring = "1.3.0"
 graphql-java = "24.3"
 graphql-kickstart-spring-boot = "15.1.0"
 commons-text = "1.14.0"
@@ -17,20 +16,19 @@ boms-dgs = { module = "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies
 graphql-kickstart-spring-boot-starter = { module = "com.graphql-java-kickstart:graphql-spring-boot-starter", version.ref = "graphql-kickstart-spring-boot" }
 commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
 graphql-java = { module = "com.graphql-java:graphql-java", version.ref = "graphql-java" }
-tailrocks-maven-publish-conventions = { module = "com.tailrocks.gradle:maven-publish-conventions", version = "0.6.0" }
-tailrocks-signing-conventions = { module = "com.tailrocks.gradle:signing-conventions", version = "0.5.1" }
-tailrocks-kotlin-conventions = { module = "com.tailrocks.gradle:kotlin-conventions", version = "0.6.2" }
-tailrocks-junit-conventions = { module = "com.tailrocks.gradle:junit-conventions", version = "0.5.1" }
+tailrocks-maven-publish-conventions = { module = "com.tailrocks.gradle:maven-publish-conventions", version = "0.7.0" }
+tailrocks-signing-conventions = { module = "com.tailrocks.gradle:signing-conventions", version = "0.6.0" }
+tailrocks-kotlin-conventions = { module = "com.tailrocks.gradle:kotlin-conventions", version = "0.7.0" }
+tailrocks-junit-conventions = { module = "com.tailrocks.gradle:junit-conventions", version = "0.6.0" }
 kotest-runner-junit = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
-kotest-framework-datatest = { module = "io.kotest:kotest-framework-datatest", version.ref = "kotest" }
-kotest-extensions-spring = { module = "io.kotest.extensions:kotest-extensions-spring", version.ref = "kotest-spring" }
+kotest-extensions-spring = { module = "io.kotest:kotest-extensions-spring", version.ref = "kotest" }
 
 [plugins]
 test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
-tailrocks-spotless = { id = "com.tailrocks.spotless", version = "0.5.2" }
-tailrocks-java = { id = "com.tailrocks.java", version = "0.5.1" }
-tailrocks-idea = { id = "com.tailrocks.idea", version = "0.5.1" }
-tailrocks-versions = { id = "com.tailrocks.versions", version = "0.5.2" }
+tailrocks-spotless = { id = "com.tailrocks.spotless", version = "0.6.0" }
+tailrocks-java = { id = "com.tailrocks.java", version = "0.6.0" }
+tailrocks-idea = { id = "com.tailrocks.idea", version = "0.6.0" }
+tailrocks-versions = { id = "com.tailrocks.versions", version = "0.6.0" }
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
 spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/graphql-datetime-dgs-autoconfigure/build.gradle.kts b/graphql-datetime-dgs-autoconfigure/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies {
 
     // DGS Framework
     compileOnly(platform(libs.boms.dgs))
-    compileOnly("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
+    compileOnly("com.netflix.graphql.dgs:graphql-dgs-spring-graphql-starter")
 }
diff --git a/graphql-datetime-dgs-starter/build.gradle.kts b/graphql-datetime-dgs-starter/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
 
     // DGS Framework
     api(platform(libs.boms.dgs))
-    api("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
+    api("com.netflix.graphql.dgs:graphql-dgs-spring-graphql-starter")
 }
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDateTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDateTest.kt
@@ -24,7 +24,7 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.shouldBe
 import java.time.ZoneOffset.UTC
-import java.util.*
+import java.util.TimeZone
 
 /**
  * @author Alexey Zhokhov
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDurationTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLDurationTest.kt
@@ -24,7 +24,7 @@ import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.shouldBe
 import java.time.Duration
 import java.time.ZoneOffset.UTC
-import java.util.*
+import java.util.TimeZone
 
 /**
  * @author Alexey Zhokhov
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTest.kt
@@ -27,7 +27,7 @@ import java.time.ZoneOffset
 import java.time.ZoneOffset.UTC
 import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatter.ISO_LOCAL_DATE
-import java.util.*
+import java.util.TimeZone
 
 /**
  * @author Alexey Zhokhov
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTimeTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalDateTimeTest.kt
@@ -29,7 +29,7 @@ import java.time.ZoneOffset
 import java.time.ZoneOffset.UTC
 import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatter.ISO_INSTANT
-import java.util.*
+import java.util.TimeZone
 import java.util.concurrent.TimeUnit.MILLISECONDS
 
 /**
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalTimeTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLLocalTimeTest.kt
@@ -24,7 +24,7 @@ import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.shouldBe
 import java.time.LocalTime
 import java.time.ZoneOffset.UTC
-import java.util.*
+import java.util.TimeZone
 import java.util.concurrent.TimeUnit
 
 /**
diff --git a/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLYearMonthTest.kt b/graphql-java-datetime/src/test/kotlin/com/tailrocks/graphql/datetime/GraphQLYearMonthTest.kt
@@ -24,7 +24,7 @@ import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.shouldBe
 import java.time.YearMonth
 import java.time.ZoneOffset.UTC
-import java.util.*
+import java.util.TimeZone
 
 /**
  * @author Alexey Zhokhov
diff --git a/samples/dgs-webmvc/build.gradle.kts b/samples/dgs-webmvc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
     // DGS Framework
     implementation(platform(libs.boms.dgs))
-    implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
+    implementation("com.netflix.graphql.dgs:graphql-dgs-spring-graphql-starter")
 
     // Spring Boot
     implementation("org.springframework.boot:spring-boot-starter-web")
diff --git a/samples/dgs-webmvc/src/test/kotlin/sample/dgs/webmvc/DgsWebMvcSampleApplicationTests.kt b/samples/dgs-webmvc/src/test/kotlin/sample/dgs/webmvc/DgsWebMvcSampleApplicationTests.kt
@@ -18,6 +18,7 @@ package sample.dgs.webmvc
 import graphql.GraphQL
 import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
+import io.kotest.core.extensions.ApplyExtension
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.extensions.spring.SpringExtension
 import io.kotest.matchers.booleans.shouldBeTrue
@@ -29,19 +30,21 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.ApplicationContext
-import org.springframework.http.*
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
+@ApplyExtension(SpringExtension::class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class DgsWebMvcSampleApplicationTests : FreeSpec() {
 
-    override fun extensions() = listOf(SpringExtension)
-
     data class GraphQLResponse(val data: ResponseData?)
 
     data class ResponseData(
diff --git a/samples/kickstart-webflux/src/test/kotlin/sample/kickstart/webflux/KickstartWebFluxSampleApplicationTests.kt b/samples/kickstart-webflux/src/test/kotlin/sample/kickstart/webflux/KickstartWebFluxSampleApplicationTests.kt
@@ -18,6 +18,7 @@ package sample.kickstart.webflux
 import graphql.GraphQL
 import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
+import io.kotest.core.extensions.ApplyExtension
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.extensions.spring.SpringExtension
 import io.kotest.matchers.booleans.shouldBeTrue
@@ -29,19 +30,21 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.ApplicationContext
-import org.springframework.http.*
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
+@ApplyExtension(SpringExtension::class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class KickstartWebFluxSampleApplicationTests : FreeSpec() {
 
-    override fun extensions() = listOf(SpringExtension)
-
     data class GraphQLResponse(val data: ResponseData?)
 
     data class ResponseData(
diff --git a/samples/kickstart-webmvc/src/test/kotlin/sample/kickstart/webmvc/KickstartWebMvcSampleApplicationTests.kt b/samples/kickstart-webmvc/src/test/kotlin/sample/kickstart/webmvc/KickstartWebMvcSampleApplicationTests.kt
@@ -18,6 +18,7 @@ package sample.kickstart.webmvc
 import graphql.GraphQL
 import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
+import io.kotest.core.extensions.ApplyExtension
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.extensions.spring.SpringExtension
 import io.kotest.matchers.booleans.shouldBeTrue
@@ -29,19 +30,21 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.ApplicationContext
-import org.springframework.http.*
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
+@ApplyExtension(SpringExtension::class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class KickstartWebMvcSampleApplicationTests : FreeSpec() {
 
-    override fun extensions() = listOf(SpringExtension)
-
     data class GraphQLResponse(val data: ResponseData?)
 
     data class ResponseData(
diff --git a/samples/spring-boot-webmvc/src/test/kotlin/sample/spring/boot/webmvc/SpringBootWebMvcSampleApplicationTests.kt b/samples/spring-boot-webmvc/src/test/kotlin/sample/spring/boot/webmvc/SpringBootWebMvcSampleApplicationTests.kt
@@ -16,6 +16,7 @@
 package sample.spring.boot.webmvc
 
 import graphql.schema.GraphQLScalarType
+import io.kotest.core.extensions.ApplyExtension
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.extensions.spring.SpringExtension
 import io.kotest.matchers.booleans.shouldBeTrue
@@ -28,19 +29,21 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.ApplicationContext
 import org.springframework.graphql.execution.GraphQlSource
-import org.springframework.http.*
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
+@ApplyExtension(SpringExtension::class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class SpringBootWebMvcSampleApplicationTests : FreeSpec() {
 
-    override fun extensions() = listOf(SpringExtension)
-
     data class GraphQLResponse(val data: ResponseData?)
 
     data class ResponseData(

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`
`5`	`5`	`java {`
`6`	`6`	`toolchain {`
`7`		`- languageVersion.set(JavaLanguageVersion.of(17))`
	`7`	`+ languageVersion.set(JavaLanguageVersion.of(21))`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`		-import org.gradle.kotlin.dsl.`java-library`
`2`		-import org.gradle.kotlin.dsl.`maven-publish`
`3`		`-`
`4`	`1`	`plugins {`
`5`	`2`	`java-library`
`6`	`3`	`maven-publish`
`7`	`4`	`id("com.tailrocks.maven-publish")`
`8`	`5`	`id("com.tailrocks.signing")`
`9`	`6`	`}`
`10`	`7`
	`8`	`+/*`
`11`	`9`	`java {`
`12`	`10`	`withJavadocJar()`
`13`	`11`	`withSourcesJar()`
`@@ -28,3 +26,4 @@ publishing {`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`	`}`
	`29`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ val libs = catalogs.named("libs")`
`10`	`10`	`dependencies {`
`11`	`11`	`testImplementation(libs.findLibrary("kotest.runner.junit").orElseThrow())`
`12`	`12`	`testImplementation(libs.findLibrary("kotest.assertions.core").orElseThrow())`
`13`		`- testImplementation(libs.findLibrary("kotest.framework.datatest").orElseThrow())`
	`13`	`+ //testImplementation(libs.findLibrary("kotest.framework.datatest").orElseThrow())`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ dependencies {`
`12`	`12`
`13`	`13`	`// DGS Framework`
`14`	`14`	`compileOnly(platform(libs.boms.dgs))`
`15`		`- compileOnly("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")`
	`15`	`+ compileOnly("com.netflix.graphql.dgs:graphql-dgs-spring-graphql-starter")`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ dependencies {`
`7`	`7`
`8`	`8`	`// DGS Framework`
`9`	`9`	`api(platform(libs.boms.dgs))`
`10`		`- api("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")`
	`10`	`+ api("com.netflix.graphql.dgs:graphql-dgs-spring-graphql-starter")`
`11`	`11`	`}`