Merge pull request #461 from jburel/gha_update

Update infra

Author: sbesson

.github/workflows/gradle.yml

@@ -12,22 +12,22 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:
       gradle_version: 6.8.3 # use ``current`` to install the current stable release
       gradle_commands: build # default is build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
           cache: 'gradle'
           java-package: 'jdk+fx'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.gradle_version }}
       - name: Run commands
@@ -37,33 +37,33 @@ jobs:
         shell: bash
         run: echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
       - name: Re-install innosetup
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         shell: cmd
         run: |
           choco uninstall innosetup
           choco install innosetup --version=5.6.1
       - name: Build insight exe
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         shell: cmd
         run: |
           gradle packageApplicationExe
       - name: Build importer exe
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         shell: cmd
         run: |
           gradle packageImporterApplicationExe
       - name: Build insight msi
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         shell: cmd
         run: |
           gradle packageApplicationMsi
       - name: Build importer msi
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         shell: cmd
         run: |
           gradle packageImporterApplicationMsi
       - name: Check MSI
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         run: |
           msi=(`find build/packaged/installImporterDist/bundles -maxdepth 1 -name "*.msi"`)
           if [ ${#msi[@]} == 0 ]; then
@@ -75,29 +75,29 @@ jobs:
           fi
         shell: bash
       - name: Upload zip and jar
-        if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
+        if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
         uses: actions/upload-artifact@v4
         with:
             name: artifacts-${{ matrix.os }}-OMERO
             path: build/distributions/OMERO*
             if-no-files-found: error
       - name: Upload jar
-        if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
-        uses: actions/upload-artifact@v3
+        if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-${{ matrix.os }}-omero_
           path: build/libs/omero_*
           if-no-files-found: error
       - name: Upload insight artifacts
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
-        uses: actions/upload-artifact@v3
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-${{ matrix.os }}-insight
           path: build/packaged/main/bundles/*
           if-no-files-found: error
       - name: Upload importer artifacts
-        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
-        uses: actions/upload-artifact@v3
+        if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '11')
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-${{ matrix.os }}-importer
           path: build/packaged/installImporterDist/bundles/*
@@ -108,7 +108,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts from build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: List artifacts
         run: ls -R
       - name: Upload binaries to release

build.gradle

@@ -15,9 +15,13 @@ repositories {
     mavenCentral()
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+//java {
+//    sourceCompatibility = JavaVersion.VERSION_11
+//    targetCompatibility = JavaVersion.VERSION_11
+//}
+
+compileJava {
+    options.release = 8
 }
 
 dependencies {