diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50053876..5e4985b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} @@ -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 diff --git a/.gitignore b/.gitignore index 1a2c8c88..bd8960a8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,12 @@ docs/_site *.sublime-project *.sublime-workspace +# VSCode +/.vscode/ + +# Metals +/.bsp/ +/project/**/metals.sbt + # emacs TAGS diff --git a/.scalafmt.conf b/.scalafmt.conf index 7f5d60a7..1c5f36b5 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.8.1" align.openParenCallSite = true align.openParenDefnSite = true maxColumn = 120 diff --git a/build.sbt b/build.sbt index 7f344cb1..d505660e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val Scala212 = "2.12.18" +val Scala212 = "2.12.19" val Scala213 = "2.13.12" val Scala3Version = "3.3.0" @@ -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."), @@ -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) @@ -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 ) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 44304f29..205de45e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")