diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw index 99e8ba2a4d5..f75be4186ff 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw @@ -95,15 +95,8 @@ repositories { @dependencies.template(applicationType, project, features, gradleBuild) -@if(features.contains("geb-with-webdriver-binaries")) { -// geb-with-webdriver-binaries is limited to Gradle 8.6 with max JDK 21 -compileJava.options.release = @JdkVersion.valueOf(Math.min(features.javaVersion().majorVersion(), JdkVersion.JDK_21.majorVersion())).majorVersion() - -} else { compileJava.options.release = @features.getTargetJdk() -} - @if (features.contains("jrebel")) { bootRun { dependsOn(generateRebel) diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw index 7a435b934da..116836b38ce 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw @@ -33,12 +33,7 @@ Features features) distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -@if(features.contains("geb-with-webdriver-binaries")) { -# geb-with-webdriver-binaries is limited to Gradle 8.6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -} else { distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip -} networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java index 0215b0373d4..23b8ede9588 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java @@ -52,13 +52,13 @@ public String getName() { @Override public String getTitle() { - return "Geb Functional Testing for Grails with WebDriver binaries Gradle plugin - no longer maintained"; + return "Geb Functional Testing using WebDriver binaries Gradle plugin"; } @NonNull @Override public String getDescription() { - return "This plugins configure Geb for Grails framework to write automation tests with WebDriver binaries Gradle plugin. No longer maintained and limited to Gradle 8.6 and JDK 21. geb-with-testcontainers is the replacement and default starting with Grails 7."; + return "This plugin configures Geb to use the WebDriver binaries Gradle plugin for downloading and caching the WebDriver binary for your platform."; } @Override @@ -96,8 +96,8 @@ public void processSelectedFeatures(FeatureContext featureContext) { @Override public void apply(GeneratorContext generatorContext) { generatorContext.addBuildPlugin(GradlePlugin.builder() - .id("com.github.erdi.webdriver-binaries") - .lookupArtifactId("webdriver-binaries-gradle-plugin") + .id("org.ysb33r.webdriver-binaries") + .lookupArtifactId("webdriver-binaries") .extension( new RockerWritable( webdriverBinariesPlugin.template( @@ -106,7 +106,6 @@ public void apply(GeneratorContext generatorContext) { ) ) ) - .version("3.2") .build()); Stream.of("api", "support", "remote-driver") diff --git a/grails-forge/grails-forge-core/src/main/resources/pom.xml b/grails-forge/grails-forge-core/src/main/resources/pom.xml index c6f7aadd7dd..8b81f55d2f3 100644 --- a/grails-forge/grails-forge-core/src/main/resources/pom.xml +++ b/grails-forge/grails-forge-core/src/main/resources/pom.xml @@ -36,17 +36,17 @@ io.micronaut.platform micronaut-platform pom - 4.9.2 + 4.10.1 org.grails.plugins grails-web-console - 7.0.0-M3 + 7.0.0 org.apache.grails grails-quartz - 4.0.0-M3 + 4.0.0 @@ -62,12 +62,12 @@ com.gradleup.shadow shadow-gradle-plugin - 9.0.2 + 9.2.2 - com.github.erdi - webdriver-binaries-gradle-plugin - 3.2 + org.ysb33r + webdriver-binaries + 4.0.0 org.zeroturnaround diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebWithWebDriverBinariesSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebWithWebDriverBinariesSpec.groovy index 6ccb44acd26..ecc1139be49 100644 --- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebWithWebDriverBinariesSpec.groovy +++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebWithWebDriverBinariesSpec.groovy @@ -69,7 +69,7 @@ class GebWithWebDriverBinariesSpec extends ApplicationContextSpec implements Com def buildGradle = output['build.gradle'] expect: - buildGradle.contains('id "com.github.erdi.webdriver-binaries"') + buildGradle.contains('id "org.ysb33r.webdriver-binaries"') buildGradle.contains('webdriverBinaries') buildGradle.contains("chromedriver '122.0.6260.0'") buildGradle.contains("geckodriver '0.33.0'") @@ -82,7 +82,7 @@ class GebWithWebDriverBinariesSpec extends ApplicationContextSpec implements Com def buildGradle = output['build.gradle'] expect: - buildGradle.contains('id "com.github.erdi.webdriver-binaries"') + buildGradle.contains('id "org.ysb33r.webdriver-binaries"') buildGradle.contains('webdriverBinaries') buildGradle.contains("chromedriver '122.0.6260.0'") buildGradle.contains("geckodriver '0.33.0'") diff --git a/grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy b/grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy index 7caf80b4228..d3df5d1439a 100644 --- a/grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy +++ b/grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy @@ -91,7 +91,7 @@ class CreateAppSpec extends CommandSpec { expect: gradleProperties.exists() - gradleProperties.text.contains('micronautPlatformVersion=4.9.2') + gradleProperties.text.contains('micronautPlatformVersion=4.10.1') gradleBuildFile.exists() gradleBuildFile.text.contains('implementation "org.apache.grails:grails-micronaut"') }