From e11826d0b367e4e9bb34024ae17353737e9391a9 Mon Sep 17 00:00:00 2001
From: Adam Pounder <3522358-Poundex@users.noreply.gitlab.com>
Date: Sat, 26 Oct 2024 11:13:25 +0100
Subject: [PATCH] Use stock images

---
 .circleci/config.yml     | 22 +++++++++++-----------
 buildSrc/build.gradle    |  6 ++++++
 buildSrc/settings.gradle | 14 ++++++++++++++
 settings.gradle          | 11 +++++++++++
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 00d2007d..e9d40b35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   check:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
     resource_class: large
     environment:
       GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -30,7 +30,7 @@ jobs:
             - .gradle-home
   manual:
     docker:
-      - image: gebish/ci:v13
+      - image: selenium/standalone-firefox
         environment:
           GRADLE_OPTS: "-Xmx1024m -XX:MaxMetaspaceSize=256m"
           GRADLE_USER_HOME: ".gradle-home"
@@ -63,7 +63,7 @@ jobs:
             - .gradle-home
   dockerised-cross-browser:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
         environment:
           GRADLE_OPTS: "-Xmx1024m -XX:MaxMetaspaceSize=256m"
           GRADLE_USER_HOME: ".gradle-home"
@@ -91,7 +91,7 @@ jobs:
             - .gradle-home
   local-cross-browser:
     docker:
-      - image: gebish/ci:v13
+      - image: selenium/standalone-chromium
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -115,7 +115,7 @@ jobs:
             - .gradle-home
   saucelabs:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -172,7 +172,7 @@ jobs:
 #            - .gradle-home
   non-ie:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -198,7 +198,7 @@ jobs:
             - .gradle-home
   ie:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -224,7 +224,7 @@ jobs:
             - .gradle-home
   upload:
     docker:
-      - image: gebish/ci:v13
+      - image: eclipse-temurin:21-jdk
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -245,7 +245,7 @@ jobs:
             - .gradle-home
   publish-site:
     docker:
-      - image: gebish/ci:v13
+      - image: alpine/git
     steps:
       - checkout
       - run:
@@ -254,7 +254,7 @@ jobs:
             git push -f heroku master
   trigger-example-projects-4.x:
     docker:
-      - image: gebish/ci:v13
+      - image: alpine/curl
     steps:
       - run:
           command: |
@@ -264,7 +264,7 @@ jobs:
             curl -H "Authorization: Bearer ${APPVEYOR_TOKEN}" -H "Content-type: application/json" -X POST https://ci.appveyor.com/api/builds -d '{"accountName": "erdi", "projectSlug": "geb-example-gradle", "branch": "4.x"}'
   trigger-example-projects-master:
     docker:
-      - image: gebish/ci:v13
+      - image: alpine/curl
     steps:
       - run:
           command: |
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 10be52ff..f0a94943 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -19,6 +19,12 @@ plugins {
 	id 'groovy-gradle-plugin'
 }
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(11)
+	}
+}
+
 repositories {
 	gradlePluginPortal()
 	mavenCentral()
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index 7e86eb13..463d8c57 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -14,6 +14,20 @@
  * limitations under the License.
  */
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver")
+}
+
+toolchainManagement {
+    jvm {
+        javaRepositories {
+            repository("foojay") {
+                resolverClass = org.gradle.toolchains.foojay.FoojayToolchainResolver
+            }
+        }
+    }
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
diff --git a/settings.gradle b/settings.gradle
index 68a315f3..a043ba0d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "org.kordamp.gradle.oci-build-cache" version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver") version "0.8.0"
 }
 
 include "module",
@@ -62,3 +63,13 @@ buildCache {
         }
     }
 }
+
+toolchainManagement {
+    jvm {
+        javaRepositories {
+            repository("foojay") {
+                resolverClass = org.gradle.toolchains.foojay.FoojayToolchainResolver
+            }
+        }
+    }
+}