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

Update Scala Native to 0.5.3 #617

Merged
merged 11 commits into from
Jun 9, 2024
Merged
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.12, 2.12.18, 3.3.0]
scala: [2.13.12, 2.12.19, 3.3.0]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -180,32 +180,32 @@ jobs:
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.18, rootJS)
- name: Download target directories (2.12.19, rootJS)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJS

- name: Inflate target directories (2.12.18, rootJS)
- name: Inflate target directories (2.12.19, rootJS)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.18, rootJVM)
- name: Download target directories (2.12.19, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJVM

- name: Inflate target directories (2.12.18, rootJVM)
- name: Inflate target directories (2.12.19, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.18, rootNative)
- name: Download target directories (2.12.19, rootNative)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootNative

- name: Inflate target directories (2.12.18, rootNative)
- name: Inflate target directories (2.12.19, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,12 @@ docs/_site
*.sublime-project
*.sublime-workspace

# VSCode
/.vscode/

# Metals
/.bsp/
/project/**/metals.sbt

# emacs
TAGS
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.17"
version = "3.8.1"
align.openParenCallSite = true
align.openParenDefnSite = true
maxColumn = 120
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val Scala212 = "2.12.18"
val Scala212 = "2.12.19"
val Scala213 = "2.13.12"
val Scala3Version = "3.3.0"

Expand Down Expand Up @@ -42,8 +42,8 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
name := "paiges-core",
moduleName := "paiges-core",
libraryDependencies ++= Seq(
"org.scalatestplus" %%% "scalacheck-1-16" % "3.2.14.0" % Test,
"org.scalatest" %%% "scalatest-funsuite" % "3.2.17" % Test
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.18.0" % Test,
"org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % Test
),
// TODO: 2.13 has warnings for using Stream, but scalacheck Shrink
tlFatalWarningsInCi := scalaVersion.value.startsWith("2.12."),
Expand Down Expand Up @@ -74,9 +74,9 @@ lazy val cats = crossProject(JSPlatform, JVMPlatform, NativePlatform)
name := "paiges-cats",
moduleName := "paiges-cats",
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.10.0",
"org.typelevel" %%% "cats-laws" % "2.10.0" % Test,
"org.typelevel" %%% "discipline-scalatest" % "2.2.0" % Test
"org.typelevel" %%% "cats-core" % "2.12.0",
"org.typelevel" %%% "cats-laws" % "2.12.0" % Test,
"org.typelevel" %%% "discipline-scalatest" % "2.3.0" % Test
)
)
.disablePlugins(JmhPlugin)
Expand Down Expand Up @@ -131,6 +131,6 @@ lazy val commonJsSettings = Seq(

lazy val commonNativeSettings = Seq(
// Remove when native is published for the default previous versions
tlVersionIntroduced := List("2.12", "2.13").map(_ -> "0.4.1").toMap + ("3" -> "0.4.3"),
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.5.0").toMap,
coverageEnabled := false
)
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.9.9
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.22")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
Loading