Merge pull request #415 from jesperancinha/auto-update

Updates
jesperancinha · Jul 19, 2024 · 06ebe65 · 06ebe65
2 parents 3bd04e9 + 9ca1aa1
commit 06ebe65
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/whiskers-merge.yml b/.github/workflows/whiskers-merge.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

diff --git a/.github/workflows/whiskers-pull-request.yml b/.github/workflows/whiskers-pull-request.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
 
-      - name: Setup Gradle Env
+      - name: Setup Gradle 8.9
         run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'"
 
       - name: Build Gradle
@@ -89,7 +89,7 @@ jobs:
       - name: Setup Binaries
         run: make setup-binaries
 
-      - name: Setup Gradle Env
+      - name: Setup Gradle 8.9
         run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'"
 
       - name: Install Kotlin Native
@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: '21'
 
       - name: Setup Gradle
@@ -160,7 +160,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: '21'
 
       - name: Setup Gradle

diff --git a/.github/workflows/whiskers.yml b/.github/workflows/whiskers.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
 
-      - name: Setup Gradle Env
+      - name: Setup Gradle 8.9
         run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'"
 
       - name: Build Gradle
@@ -89,7 +89,7 @@ jobs:
       - name: Setup Binaries
         run: make setup-binaries
 
-      - name: Setup Gradle Env
+      - name: Setup Gradle 8.9
         run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'"
 
       - name: Install Kotlin Native
@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: '21'
 
       - name: Setup Gradle
@@ -160,7 +160,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: '21'
 
       - name: Setup Gradle

diff --git a/Makefile.mk b/Makefile.mk
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 GITHUB_RUN_ID ?=123
-GRADLE_VERSION ?= 8.7
+GRADLE_VERSION ?= 8.9
 
 b:
 

diff --git a/whiskers-graalvm/jvm/Dockerfile b/whiskers-graalvm/jvm/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-alpine
+FROM eclipse-temurin:21-alpine
 
 WORKDIR /root