Skip to content

Commit fed8476

Browse files
committed
Update Micronaut forge tests to use Java 25 due to the new requirement
1 parent f28b048 commit fed8476

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@ package org.grails.forge.feature.micronaut
2121

2222
import org.grails.forge.BeanContextSpec
2323
import org.grails.forge.BuildBuilder
24+
import org.grails.forge.options.JdkVersion
2425

2526
class MicronautHttpClientSpec extends BeanContextSpec {
2627

2728

2829
void "test dependencies"() {
2930
when:
31+
// Micronaut features require JDK 25+ because micronaut-core's ScopedValues
32+
// references java.lang.ScopedValue.CallableOp (JEP 506, finalized in JDK 25).
3033
final String template = new BuildBuilder(beanContext)
3134
.features(["micronaut-http-client"])
35+
.jdkVersion(JdkVersion.JDK_25)
3236
.render()
3337

3438
then:

grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/reloading/SpringBootDevToolsSpec.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.grails.forge.ApplicationContextSpec
2424
import org.grails.forge.application.ApplicationType
2525
import org.grails.forge.fixture.CommandOutputFixture
2626
import org.grails.forge.options.DevelopmentReloading
27+
import org.grails.forge.options.JdkVersion
2728
import org.grails.forge.options.Options
2829

2930
class SpringBootDevToolsSpec extends ApplicationContextSpec implements CommandOutputFixture {
@@ -65,6 +66,8 @@ class SpringBootDevToolsSpec extends ApplicationContextSpec implements CommandOu
6566

6667
void "test spring-boot-devtools is not applied when grails-micronaut is selected"() {
6768
expect:
68-
!('spring-boot-devtools' in getFeatures(['grails-micronaut'], new Options(DevelopmentReloading.DEVTOOLS)))
69+
// Micronaut features require JDK 25+ because micronaut-core's ScopedValues
70+
// references java.lang.ScopedValue.CallableOp (JEP 506, finalized in JDK 25).
71+
!('spring-boot-devtools' in getFeatures(['grails-micronaut'], new Options(DevelopmentReloading.DEVTOOLS, JdkVersion.JDK_25)))
6972
}
7073
}

grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ package org.grails.forge.create
2121

2222
import org.grails.forge.application.ApplicationType
2323
import org.grails.forge.application.OperatingSystem
24+
import org.grails.forge.options.DevelopmentReloading
25+
import org.grails.forge.options.JdkVersion
2426
import org.grails.forge.utils.CommandSpec
2527

2628
class CreateAppSpec extends CommandSpec {
@@ -84,7 +86,10 @@ class CreateAppSpec extends CommandSpec {
8486

8587
void "test create-app with micronaut feature"() {
8688
given:
87-
generateProject(OperatingSystem.MACOS_ARCH64, ['grails-micronaut'], ApplicationType.WEB)
89+
// Micronaut features require JDK 25+ because micronaut-core's ScopedValues
90+
// references java.lang.ScopedValue.CallableOp (JEP 506, finalized in JDK 25).
91+
generateProject(OperatingSystem.MACOS_ARCH64, ['grails-micronaut'], ApplicationType.WEB,
92+
DevelopmentReloading.DEFAULT_OPTION, JdkVersion.JDK_25)
8893

8994
def gradleProperties = new File(dir, 'gradle.properties')
9095
def gradleBuildFile = new File(dir, 'build.gradle')

grails-forge/test-core/src/test/groovy/org/grails/forge/utils/CommandSpec.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import org.grails.forge.io.FileSystemOutputHandler
2828
import org.grails.forge.io.OutputHandler
2929
import org.grails.forge.options.BuildTool
3030
import org.grails.forge.options.DevelopmentReloading
31+
import org.grails.forge.options.JdkVersion
3132
import org.grails.forge.options.Language
3233
import org.grails.forge.options.Options
3334
import org.grails.forge.options.TestFramework
@@ -88,10 +89,11 @@ abstract class CommandSpec extends Specification {
8889
void generateProject(OperatingSystem operatingSystem = OperatingSystem.LINUX,
8990
List<String> features = [],
9091
ApplicationType applicationType = ApplicationType.WEB,
91-
DevelopmentReloading reloading = DevelopmentReloading.DEFAULT_OPTION) {
92+
DevelopmentReloading reloading = DevelopmentReloading.DEFAULT_OPTION,
93+
JdkVersion javaVersion = JdkVersion.DEFAULT_OPTION) {
9294
applicationContext.getBean(ProjectGenerator).generate(applicationType,
9395
NameUtils.parse("example.grails.foo"),
94-
new Options(reloading),
96+
new Options(reloading, javaVersion),
9597
operatingSystem,
9698
features,
9799
new FileSystemOutputHandler(dir, ConsoleOutput.NOOP),

0 commit comments

Comments
 (0)