Update to java 21 (#80)

* Update to java 21 Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> * Remove unnecessary shasum for test Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> * Remove unnecessary shasum for test Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> --------- Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
AppThreat · Sep 22, 2023 · c8b9eeb · c8b9eeb
1 parent 8c305d3
commit c8b9eeb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/nodejstests.yml b/.github/workflows/nodejstests.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        java-version: ['19']
-        node-version: [20.x]
+        java-version: ['17', '19', '20', '21']
+        node-version: ['20.x']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -40,11 +40,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - run: |
           sbt stage assembly createDistribution
-          sha512sum target/atom.zip > target/atom.zip.sha512
           cd wrapper/nodejs
           bash build.sh
           sudo npm install -g .
@@ -62,8 +61,8 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java-version: ['19']
-        node-version: [20.x]
+        java-version: ['17', '19', '20', '21']
+        node-version: ['20.x']
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
@@ -94,7 +93,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: build
         shell: pwsh

diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: 'temurin'
+        distribution: 'zulu'
         java-version: '19'
     - name: Release
       run: |

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -33,8 +33,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: 19
+          distribution: 'zulu'
+          java-version: '21'
       - run: |
           sbt stage astGenDlTask
           ./atom.sh -o /tmp/java.atom -l java $GITHUB_WORKSPACE/repotests/shiftleft-java-example -Dlog4j.configurationFile=log4j2.xml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,8 +19,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: '19'
+          distribution: 'zulu'
+          java-version: '21'
       - run: |
           sbt stage astGenDlTask assembly createDistribution publish
           sha512sum target/atom.zip > target/atom.zip.sha512

diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java-version: ['17', '19', '20']
+        java-version: ['17', '19', '20', '21']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -39,7 +39,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - run: |
           sbt stage astGenDlTask

diff --git a/build.sbt b/build.sbt
@@ -1,9 +1,9 @@
 name                     := "atom"
 ThisBuild / organization := "io.appthreat"
-ThisBuild / version      := "1.2.0"
-ThisBuild / scalaVersion := "3.3.0"
+ThisBuild / version      := "1.2.2"
+ThisBuild / scalaVersion := "3.3.1"
 
-val chenVersion      = "0.0.5"
+val chenVersion      = "0.0.6"
 
 lazy val atom = Projects.atom
 

diff --git a/wrapper/nodejs/package-lock.json b/wrapper/nodejs/package-lock.json
diff --git a/wrapper/nodejs/package.json b/wrapper/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",