Webdriver support with Apple Silicon M1

grails · Jun 16, 2023 · ad660a5 · ad660a5
1 parent 41fec16
commit ad660a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/test/Geb.java b/grails-forge-core/src/main/java/org/grails/forge/feature/test/Geb.java
@@ -47,7 +47,7 @@ public Geb(Spock spock) {
 
     @Override
     public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
-        return options.getOperatingSystem() != OperatingSystem.MACOS_ARCH64 && applicationType == ApplicationType.WEB;
+        return applicationType == ApplicationType.WEB;
     }
 
     @NonNull
@@ -100,7 +100,7 @@ public void apply(GeneratorContext generatorContext) {
             generatorContext.addBuildPlugin(GradlePlugin.builder()
                     .id("com.github.erdi.webdriver-binaries")
                     .lookupArtifactId("webdriver-binaries-gradle-plugin")
-                    .extension(new RockerWritable(webdriverBinariesPlugin.template(generatorContext.getProject())))
+                    .extension(new RockerWritable(webdriverBinariesPlugin.template(generatorContext.getProject(), generatorContext.getOperatingSystem())))
                     .build());
 
             generatorContext.addDependency(Dependency.builder()

diff --git a/...e/src/main/java/org/grails/forge/feature/test/template/webdriverBinariesPlugin.rocker.raw b/...e/src/main/java/org/grails/forge/feature/test/template/webdriverBinariesPlugin.rocker.raw
@@ -1,10 +1,13 @@
 @import org.grails.forge.application.Project;
+@import org.grails.forge.application.OperatingSystem;
 
-@args(Project project)
+@args(Project project, OperatingSystem os)
 
 webdriverBinaries {
-    chromedriver '2.32'
-    geckodriver '0.19.0'
-    iedriverserver '3.8.0'
-    edgedriver '86.0.601.0'
+    chromedriver '110.0.5481.77'
+    geckodriver '0.32.2'
+@if (os == OperatingSystem.WINDOWS) {
+    iedriverserver '3.141.59'
+}
+    edgedriver '110.0.1587.57'
 }