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

Use sbt 1.7.0
This commit is contained in:
eugene yokota 2022-07-10 23:15:22 -04:00 committed by GitHub
commit c992a314a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 28 deletions

View File

@ -21,31 +21,15 @@ jobs:
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v3
- name: Setup - name: Setup JDK
uses: olafurpg/setup-scala@v10 uses: actions/setup-java@v3
with: with:
java-version: "adopt@1.${{ matrix.java }}" distribution: temurin
- name: Coursier cache java-version: "${{ matrix.java }}"
uses: coursier/cache-action@v5 cache: sbt
- name: Cache sbt - name: Build and test (1)
uses: actions/cache@v1 if: ${{ matrix.jobtype == 1 }}
with: shell: bash
path: $HOME/.sbt
key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Build and test
run: | run: |
case ${{ matrix.jobtype }} in sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll +test +packagedArtifacts
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

View File

@ -7,7 +7,7 @@ val _ = {
sys.props += ("line.separator" -> "\n") sys.props += ("line.separator" -> "\n")
} }
Global / semanticdbEnabled := !(Global / insideCI).value Global / semanticdbEnabled := !(Global / insideCI).value
Global / semanticdbVersion := "4.5.9" // Global / semanticdbVersion := "4.5.9"
ThisBuild / version := { ThisBuild / version := {
val old = (ThisBuild / version).value val old = (ThisBuild / version).value
nightlyVersion match { nightlyVersion match {

View File

@ -1 +1 @@
sbt.version=1.6.2 sbt.version=1.7.0