From 556a3fb11be3e75557326724fbc511278da8b3f0 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 15 Apr 2024 09:02:39 +0800 Subject: [PATCH] 0.13.0 . . --- .github/workflows/actions.yml | 4 +--- build.sc | 4 ++-- project/Constants.scala | 2 +- readme/Readme.scalatex | 14 +++++++++++++- .../test/src/scalatags/generic/BasicTests.scala | 5 ++--- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5812d2e6..d28d15d1 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -27,9 +27,7 @@ jobs: run: npm install - name: Run tests - run: | - ./mill -i --disable-ticker __.resolvedIvyDeps - ./mill -i --disable-ticker -j 0 __.publishArtifacts __.test + run: ./mill -i __.publishArtifacts + __.test check-binary-compatibility: runs-on: ubuntu-latest diff --git a/build.sc b/build.sc index 6e7d0605..1a5ece0f 100644 --- a/build.sc +++ b/build.sc @@ -10,7 +10,7 @@ import mill.scalalib.api.ZincWorkerUtil.isScala3 val dottyVersions = sys.props.get("dottyVersion").toList -val scalaVersions = List("2.12.17", "2.13.10", "3.3.1") ++ dottyVersions +val scalaVersions = List("2.12.18", "2.13.13", "3.3.1") ++ dottyVersions trait ScalatagsPublishModule extends CrossScalaModule with PublishModule with PlatformScalaModule with Mima{ def ivyDeps = Agg( @@ -93,7 +93,7 @@ object scalatags extends Module { object test extends ScalaJSTests with CommonTestModule{ def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.1.0").map(_.withDottyCompat(crossScalaVersion)) - def jsEnvConfig = mill.scalajslib.api.JsEnvConfig.JsDom() + override def jsEnvConfig = mill.scalajslib.api.JsEnvConfig.JsDom() } } diff --git a/project/Constants.scala b/project/Constants.scala index 356eb267..835aee50 100644 --- a/project/Constants.scala +++ b/project/Constants.scala @@ -1,4 +1,4 @@ package scalatags object Constants{ - val version = "0.9.4" + val version = "0.13.0" } diff --git a/readme/Readme.scalatex b/readme/Readme.scalatex index 53663896..0106e526 100644 --- a/readme/Readme.scalatex +++ b/readme/Readme.scalatex @@ -1103,7 +1103,7 @@ @def pr(s: Int) = a(s, href:="https://github.com/lihaoyi/scalatags/pull/"+s) @sect{Changelog} - @sect{0.10.0} + @sect{0.13.0} @ul @li Support for Scala Native 0.5.0 @@ -1111,6 +1111,18 @@ Dropped Scala 2.11.x support @li Minimum version of Scala 3 increased to 3.3.1 + @sect{0.11.0} + @ul + @li + Fix issue with refining of text tags + @sect{0.11.0} + @ul + @li + Support for Scala 3.x + @sect{0.10.0} + @ul + @li + Fix typo @hl.scala{lazy val mask = attr("mak")} @sect{0.9.3} @ul @li diff --git a/scalatags/test/src/scalatags/generic/BasicTests.scala b/scalatags/test/src/scalatags/generic/BasicTests.scala index bfe61b26..0ce9aacd 100644 --- a/scalatags/test/src/scalatags/generic/BasicTests.scala +++ b/scalatags/test/src/scalatags/generic/BasicTests.scala @@ -140,14 +140,13 @@ class BasicTests[Builder, Output <: FragT, FragT](omg: Bundle[Builder, Output, F ) } test("compileErrors"){ - def writeType(tpe: String) = if(BuildInfo.scalaMajorVersion == "3") s"($tpe)" else tpe test("niceErrorsForAttributes"){ val msg = compileError("""a(onclick := {() => "lol"})""").msg - assert(msg.contains(s"scalatags does not know how to use ${writeType("() => String")} as an attribute")) + assert(msg.contains(s"scalatags does not know how to use () => String as an attribute")) } test("niceErrorsForStyles"){ val msg = compileError("""a(opacity:= {() => "lol"})""").msg - assert(msg.contains(s"scalatags does not know how to use ${writeType("() => String")} as an style")) + assert(msg.contains(s"scalatags does not know how to use () => String as an style")) } } test("nulls"){