Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update sbt, Scala versions, Scala Native, Scala JS, ZIO #261

Merged
merged 8 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout current branch
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.2.0
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v11
uses: actions/[email protected]
with:
distribution: zulu
java-version: 17
check-latest: true
- name: Setup sbt
uses: sbt/setup-sbt@v1
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Lint code
Expand All @@ -33,9 +39,15 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout current branch
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.2.0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v11
uses: actions/[email protected]
with:
distribution: zulu
java-version: 17
check-latest: true
- name: Setup sbt
uses: sbt/setup-sbt@v1
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Check Document Generation
Expand All @@ -47,20 +59,22 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['zulu@1.17']
java: ['17']
scala: ['212', '213', '3']
platform: ['JVM', 'JS', 'Native']
steps:
- name: Checkout current branch
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.2.0
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v11
uses: actions/setup-[email protected]
with:
distribution: zulu
java-version: ${{ matrix.java }}
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
check-latest: true
- name: Setup sbt
uses: sbt/setup-sbt@v1
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Run tests
Expand All @@ -80,11 +94,17 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- name: Checkout current branch
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.2.0
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v11
uses: actions/[email protected]
with:
distribution: zulu
java-version: 17
check-latest: true
- name: Setup sbt
uses: sbt/setup-sbt@v1
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Release artifacts
Expand Down
15 changes: 9 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ inThisBuild(
)

// Versions
val scala212 = "2.12.19"
val scala213 = "2.13.12"
val scala3 = "3.3.3"
val scala212 = "2.12.20"
val scala213 = "2.13.15"
val scala3 = "3.3.4"

val zioVersion = "2.1.1"
val javaPlatform = "11"

val zioVersion = "2.1.11"

// Command aliases for convenience and for CI
addCommandAlias("fmt", s"++$scala213; scalafmtSbt; scalafmtAll")
Expand Down Expand Up @@ -61,7 +63,8 @@ lazy val commonSettings = Seq(
"UTF-8",
"-feature",
"-unchecked",
"-language:experimental.macros"
"-language:experimental.macros",
s"-release:$javaPlatform"
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) =>
Seq(
Expand Down Expand Up @@ -113,7 +116,7 @@ lazy val zioParser = crossProject(JSPlatform, JVMPlatform, NativePlatform)
Seq.empty
case _ =>
Seq(
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full),
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full),
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.10.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.4")
Loading