Merge remote-tracking branch 'origin/integer-string-map-typehandler' …

…into integer-string-map-typehandler
ed-pilots-network · Nov 5, 2023 · f5c3d7b · f5c3d7b
2 parents 324cba4 + d002fca
commit f5c3d7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '21'
-          distribution: 'corretto'
+          distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Make gradlew executable
@@ -51,7 +51,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '21'
-          distribution: 'corretto'
+          distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Make gradlew executable

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@ java {
 
     toolchain {
         languageVersion=JavaLanguageVersion.of(21)
-        vendor=JvmVendorSpec.AMAZON
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ java { @@
         toolchain {
             languageVersion=JavaLanguageVersion.of(21)
-            vendor=JvmVendorSpec.AMAZON
         }
     }
@@ Expand Down @@