Skip to content

Commit

Permalink
Merge pull request #450 from lorandszakacs/upgrade/sbt-spiewak
Browse files Browse the repository at this point in the history
Upgrade sbt spiewak + drop sbt dotty
  • Loading branch information
lorandszakacs authored May 26, 2021
2 parents c1c68ec + addd164 commit 6e7cd28
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Check that workflows are up to date
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'

- name: Test
run: sbt ++${{ matrix.scala }} test
run: sbt --client '++${{ matrix.scala }}; test'

- name: Binary Compatibility Check
run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues
run: sbt --client '++${{ matrix.scala }}; mimaReportBinaryIssues'

- name: Compress target directories
run: tar cf targets.tar testing/jvm/target noop/jvm/target docs/target target core/js/target testing/js/target noop/js/target core/jvm/target slf4j/target project/target
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
- name: Import signing key
run: echo $PGP_SECRET | base64 -d | gpg --import

- run: sbt ++${{ matrix.scala }} release
- run: sbt --client '++${{ matrix.scala }}; release'

- if: matrix.scala == '2.12.13'
uses: ruby/setup-ruby@v1
Expand All @@ -153,7 +153,7 @@ jobs:
run: gem install jekyll -v 4

- if: matrix.scala == '2.12.13'
run: sbt ++${{ matrix.scala }} docs/publishMicrosite
run: sbt --client '++${{ matrix.scala }}; docs/publishMicrosite'

scalafmt:
name: Scalafmt
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Scalafmt
run: sbt ++${{ matrix.scala }} scalafmtCheckAll
run: sbt --client '++${{ matrix.scala }}; scalafmtCheckAll'

microsite:
name: Microsite
Expand Down Expand Up @@ -231,4 +231,4 @@ jobs:
- run: gem install jekyll -v 4

- name: Build the microsite
run: sbt ++${{ matrix.scala }} docs/makeMicrosite
run: sbt --client '++${{ matrix.scala }}; docs/makeMicrosite'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ target/
# vim
*.sw?

.vscode

# Ignore [ce]tags files
tags

Expand Down
4 changes: 1 addition & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")
// temporary until sbt-spiewak-sonatype upgrades. This unlocks Scala 3.0.0 release at the cost of some deprecation warnings in sbt!
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.21.0")

0 comments on commit 6e7cd28

Please sign in to comment.