Change build environment to JDK8 and update CI

rewards-network · Mar 25, 2021 · 83bc8c5 · 83bc8c5
1 parent b1134bd
commit 83bc8c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,8 +23,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.4, 2.12.12]
-        java: [adopt@1.11]
+        scala: [2.13.5, 2.12.13]
+        java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -71,8 +71,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.4]
-        java: [adopt@1.11]
+        scala: [2.13.5]
+        java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -97,22 +97,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.13.4)
+      - name: Download target directories (2.13.5)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.4)
+      - name: Inflate target directories (2.13.5)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.12)
+      - name: Download target directories (2.12.13)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.12)
+      - name: Inflate target directories (2.12.13)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -51,7 +51,7 @@ inThisBuild(
     ),
     homepage := Some(url("https://github.com/rewards-network/pure-aws")),
     licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
-    githubWorkflowJavaVersions := Seq("adopt@1.11"),
+    githubWorkflowJavaVersions := Seq("adopt@1.8"),
     githubWorkflowTargetTags ++= Seq("v*"),
     githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
     githubWorkflowPublish := Seq(