From 9f2338d92d934b01aa1329713ecece0586374b39 Mon Sep 17 00:00:00 2001
From: Manuel Fuchs <manuel.fuchs@salesforce.com>
Date: Wed, 5 Jun 2024 13:00:38 +0200
Subject: [PATCH] Add heroku-24 to CI

---
 .github/workflows/ci.yml                         |  2 +-
 test/compile_test.sh                             | 12 +++++++++++-
 test/spec/fixtures/ci-test-app/system.properties |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 test/spec/fixtures/ci-test-app/system.properties

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2469965..3179c7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        stack: ["heroku-20", "heroku-22"]
+        stack: ["heroku-20", "heroku-22", "heroku-24"]
     env:
       HATCHET_APP_LIMIT: 100
       HATCHET_RUN_MULTI: 1
diff --git a/test/compile_test.sh b/test/compile_test.sh
index e7ad3fb..3244960 100755
--- a/test/compile_test.sh
+++ b/test/compile_test.sh
@@ -8,8 +8,15 @@ installWrapper() {
   cp -r "$WRAPPER_DIR"/* ${BUILD_DIR}
 }
 
+requestOpenJdk8() {
+  cat > ${BUILD_DIR}/system.properties <<EOF
+java.runtime.version=8
+EOF
+}
+
 testCompileWithoutWrapper()
 {
+  requestOpenJdk8
   cat > ${BUILD_DIR}/build.gradle <<EOF
 task stage << {
   println "${expected_stage_output}"
@@ -23,6 +30,7 @@ EOF
 
 testCompileWithWrapper()
 {
+  requestOpenJdk8
   installWrapper
   expected_stage_output="STAGING:${RANDOM}"
 
@@ -34,7 +42,7 @@ EOF
 
   compile
   assertCapturedSuccess
-  assertCaptured "Installing OpenJDK 1.8"
+  assertCaptured "Installing OpenJDK 8"
   assertCaptured "${expected_stage_output}"
   assertCaptured "BUILD SUCCESSFUL"
   assertTrue "Java should be present in runtime." "[ -d ${BUILD_DIR}/.jdk ]"
@@ -46,6 +54,7 @@ EOF
 
 testCompileWithCustomTask()
 {
+  requestOpenJdk8
   installWrapper
   expected_stage_output="STAGING:${RANDOM}"
 
@@ -65,6 +74,7 @@ EOF
 
 testCompile_Fail()
 {
+  requestOpenJdk8
   installWrapper
   expected_stage_output="STAGING:${RANDOM}"
 
diff --git a/test/spec/fixtures/ci-test-app/system.properties b/test/spec/fixtures/ci-test-app/system.properties
new file mode 100644
index 0000000..221ae01
--- /dev/null
+++ b/test/spec/fixtures/ci-test-app/system.properties
@@ -0,0 +1 @@
+java.runtime.version=8