Skip to content

Commit 92632fa

Browse files
committed
Merge branch 'main' into weaver-migration
# Conflicts: # build.sbt # project/plugins.sbt # tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala
2 parents 1faf067 + f5dfff4 commit 92632fa

7 files changed

Lines changed: 23 additions & 44 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
- name: Submit Dependencies
245245
uses: scalacenter/sbt-dependency-submission@v2
246246
with:
247-
modules-ignore: rootjs_2.13 rootjs_3 docs_3 tests_sjs1_2.13 tests_sjs1_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 tests_2.13 tests_3 tests_native0.4_2.13 tests_native0.4_3
247+
modules-ignore: rootjs_2.13 rootjs_3 docs_3 tests_sjs1_2.13 tests_sjs1_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 tests_2.13 tests_3 tests_native0.5_2.13 tests_native0.5_3
248248
configs-ignore: test scala-tool scala-doc-tool test-internal
249249

250250
site:

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.9.4
1+
version = 3.10.7
22
runner.dialect = scala213
33

44
fileOverride {

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ To get started, you can use the accompanying [template](https://github.com/typel
1717
scala-cli --power new typelevel/toolkit.g8
1818
```
1919

20-
> [!IMPORTANT]
21-
> The toolkit does not yet support Scala Native 0.5.x series.
22-
2320
# Libraries included
2421

2522
* [Cats] and [Cats Effect]

build.sbt

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ThisBuild / mergifyStewardConfig ~= {
1010
_.map(_.withAuthor("typelevel-steward[bot]"))
1111
}
1212

13-
ThisBuild / crossScalaVersions := Seq("2.13.18", "3.3.5")
13+
ThisBuild / crossScalaVersions := Seq("2.13.18", "3.3.7")
1414

1515
lazy val root = tlCrossRootProject
1616
.aggregate(toolkit, toolkitTest, tests)
@@ -20,15 +20,15 @@ lazy val toolkit = crossProject(JVMPlatform, JSPlatform, NativePlatform)
2020
.settings(
2121
name := "toolkit",
2222
libraryDependencies ++= Seq(
23-
"org.typelevel" %%% "cats-core" % "2.11.0",
24-
"org.typelevel" %%% "cats-effect" % "3.6.1",
25-
"co.fs2" %%% "fs2-io" % "3.11.0",
26-
"org.gnieh" %%% "fs2-data-csv" % "1.11.3",
27-
"org.gnieh" %%% "fs2-data-csv-generic" % "1.11.3",
28-
"org.http4s" %%% "http4s-ember-client" % "0.23.30",
29-
"io.circe" %%% "circe-jawn" % "0.14.8",
30-
"org.http4s" %%% "http4s-circe" % "0.23.30",
31-
"com.monovore" %%% "decline-effect" % "2.4.1"
23+
"org.typelevel" %%% "cats-core" % "2.13.0",
24+
"org.typelevel" %%% "cats-effect" % "3.7.0",
25+
"co.fs2" %%% "fs2-io" % "3.13.0",
26+
"org.gnieh" %%% "fs2-data-csv" % "1.13.0",
27+
"org.gnieh" %%% "fs2-data-csv-generic" % "1.13.0",
28+
"org.http4s" %%% "http4s-ember-client" % "0.23.34",
29+
"io.circe" %%% "circe-jawn" % "0.14.14",
30+
"org.http4s" %%% "http4s-circe" % "0.23.34",
31+
"com.monovore" %%% "decline-effect" % "2.6.2"
3232
),
3333
mimaPreviousArtifacts := Set()
3434
)
@@ -38,10 +38,11 @@ lazy val toolkitTest = crossProject(JVMPlatform, JSPlatform, NativePlatform)
3838
.settings(
3939
name := "toolkit-test",
4040
libraryDependencies ++= Seq(
41-
"org.typelevel" %%% "cats-core" % "2.11.0",
42-
"org.typelevel" %%% "cats-effect-testkit" % "3.6.1",
41+
"org.typelevel" %%% "cats-core" % "2.13.0",
42+
"org.typelevel" %%% "cats-effect-testkit" % "3.7.0",
4343
"org.typelevel" %%% "weaver-cats" % "0.11.3" // not % Test, on purpose :)
4444
),
45+
libraryDependencySchemes += "org.scala-native" %% "test-interface_native0.5" % VersionScheme.Always,
4546
mimaPreviousArtifacts := Set()
4647
)
4748

@@ -51,11 +52,10 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
5152
name := "tests",
5253
libraryDependencies ++= Seq(
5354
"org.typelevel" %%% "weaver-cats" % "0.11.3" % Test,
54-
"co.fs2" %%% "fs2-io" % "3.11.0" % Test,
55-
"org.virtuslab.scala-cli" %% "cli" % "1.12.5" cross (CrossVersion.for2_13Use3)
55+
"co.fs2" %%% "fs2-io" % "3.13.0" % Test,
56+
"org.virtuslab.scala-cli" %% "cli" % "1.13.0" cross (CrossVersion.for2_13Use3)
5657
),
5758
buildInfoKeys += scalaBinaryVersion,
58-
buildInfoKeys += scalaVersion,
5959
buildInfoKeys += BuildInfoKey.map(Compile / dependencyClasspath) {
6060
case (_, v) =>
6161
"classPath" -> v.seq
@@ -75,15 +75,13 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
7575
Test / test := (Test / test)
7676
.dependsOn(toolkit.jvm / publishLocal, toolkitTest.jvm / publishLocal)
7777
.value,
78-
buildInfoKeys += "platform" -> "jvm",
79-
buildInfoKeys += "platformVersion" -> ""
78+
buildInfoKeys += "platform" -> "jvm"
8079
)
8180
.jsSettings(
8281
Test / test := (Test / test)
8382
.dependsOn(toolkit.js / publishLocal, toolkitTest.js / publishLocal)
8483
.value,
8584
buildInfoKeys += "platform" -> "js",
86-
buildInfoKeys += "platformVersion" -> scalaJSVersion,
8785
scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) }
8886
)
8987
.nativeSettings(
@@ -93,8 +91,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
9391
toolkitTest.native / publishLocal
9492
)
9593
.value,
96-
buildInfoKeys += "platform" -> "native",
97-
buildInfoKeys += "platformVersion" -> nativeVersion
94+
buildInfoKeys += "platform" -> "native"
9895
)
9996
.enablePlugins(BuildInfoPlugin, NoPublishPlugin)
10097

docs/index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ A toolkit of **great libraries** to start building **Typelevel** apps on JVM, No
44

55
Our very own flavour of the [Scala Toolkit].
66

7-
@:callout(info)
8-
9-
The toolkit does not yet support Scala Native 0.5.x series.
10-
11-
@:@
12-
137
## Overview
148

159
Typelevel toolkit is a meta library that currently includes these libraries:

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ val sbtTlVersion = "0.8.5"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTlVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % sbtTlVersion)
44
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTlVersion)
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
6-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
6+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")
77
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")

tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,11 @@ object ScalaCliProcess {
7070
None
7171
)
7272
.evalTap { path =>
73-
val commonHeader = List(
74-
s"//> using scala ${BuildInfo.scalaVersion}",
73+
val header = List(
74+
s"//> using scala ${BuildInfo.scalaBinaryVersion}",
7575
s"//> using toolkit typelevel:${BuildInfo.version}",
7676
s"//> using platform ${BuildInfo.platform}"
7777
)
78-
val header = BuildInfo.platform match {
79-
case "jvm" => commonHeader
80-
case "js" =>
81-
commonHeader :+
82-
s"//> using jsVersion ${BuildInfo.platformVersion}"
83-
case "native" =>
84-
commonHeader :+
85-
s"//> using nativeVersion ${BuildInfo.platformVersion}"
86-
}
8778
Stream(header.mkString("", "\n", "\n"), scriptBody.stripMargin)
8879
.through(Files[IO].writeUtf8(path))
8980
.compile

0 commit comments

Comments
 (0)