Merge pull request #403 from eed3si9n/wip/bump-sbt

Use sbt 1.7.0
sbt · Jul 11, 2022 · c992a31 · c992a31
2 parents 7b16e5b + 925c461
commit c992a31
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,31 +21,15 @@ jobs:
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
-    - name: Setup
-      uses: olafurpg/setup-scala@v10
+      uses: actions/checkout@v3
+    - name: Setup JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: "adopt@1.${{ matrix.java }}"
-    - name: Coursier cache
-      uses: coursier/cache-action@v5
-    - name: Cache sbt
-      uses: actions/cache@v1
-      with:
-        path: $HOME/.sbt
-        key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-    - name: Build and test
+        distribution: temurin
+        java-version: "${{ matrix.java }}"
+        cache: sbt
+    - name: Build and test (1)
+      if: ${{ matrix.jobtype == 1 }}
+      shell: bash
       run: |
-        case ${{ matrix.jobtype }} in
-          1)
-            sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll +test +packagedArtifacts
-            ;;
-          *)
-            echo unknown jobtype
-            exit 1
-        esac
-        rm -rf "$HOME/.ivy2/local"
-        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
-        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
-        find $HOME/.ivy2/cache                       -name "*-LM-SNAPSHOT*"       -delete || true
-        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
-        find $HOME/.sbt                              -name "*.lock"               -delete || true
+        sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll +test +packagedArtifacts
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ val _ = {
   sys.props += ("line.separator" -> "\n")
 }
 Global / semanticdbEnabled := !(Global / insideCI).value
-Global / semanticdbVersion := "4.5.9"
+// Global / semanticdbVersion := "4.5.9"
 ThisBuild / version := {
   val old = (ThisBuild / version).value
   nightlyVersion match {

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.0