Skip to content

Commit

Permalink
Fix crossbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
NeQuissimus committed Dec 14, 2019
1 parent 93afa78 commit d1d66a0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ jobs:
- uses: actions/checkout@v1
- name: Lint
run: sbt scalafmtCheckAll
- name: Test
run: sbt test
- name: Test 2.12
run: sbt ++2.12.10! test
- name: Test 2.13
run: sbt ++2.13.1! test
11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ jobs:
env:
PGP_PRIVATE: ${{ secrets.PGP_PRIVATE }}
PGP_PUBLIC: ${{ secrets.PGP_PUBLIC }}
- name: Release
run: sbt releaseEarly
- name: Release 2.12
run: sbt ++2.12.10! releaseEarly
env:
CI: GitHub
PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
- name: Release 2.13
run: sbt ++2.13.1! releaseEarly
env:
CI: GitHub
PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val mainScala = "2.12.10"
val allScala = Seq("2.11.12", mainScala, "2.13.1")
val allScala = Seq(mainScala, "2.13.1")

organization := "com.nequissimus"
name := "zio-slf4j"
Expand All @@ -25,12 +25,12 @@ scmInfo := Some(

libraryDependencies ++= Seq(
"com.lihaoyi" %% "sourcecode" % "0.1.8",
"com.lihaoyi" %% "utest" % "0.6.7" % Test,
"com.lihaoyi" %% "utest" % "0.6.9" % Test,
"org.scalaz" %% "scalaz-core" % "7.2.29" % Optional,
"dev.zio" %% "zio" % "1.0.0-RC17",
"org.slf4j" % "slf4j-api" % "1.7.29",
compilerPlugin("com.github.ghik" %% "silencer-plugin" % "1.4.2"),
"com.github.ghik" %% "silencer-lib" % "1.4.2" % Provided
compilerPlugin("com.github.ghik" % "silencer-plugin" % "1.4.4" cross CrossVersion.full),
"com.github.ghik" % "silencer-lib" % "1.4.4" % Provided cross CrossVersion.full
)

testFrameworks += new TestFramework("utest.runner.Framework")
Expand Down

0 comments on commit d1d66a0

Please sign in to comment.