From 1e42c872093504b583a6cbdc94f204727b2e7ea5 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 15 Apr 2024 09:33:30 +0800 Subject: [PATCH 1/2] . --- .mill-version | 3 +-- build.sc | 12 ++++++------ project/build.properties | 2 +- readme/Readme.scalatex | 9 +++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.mill-version b/.mill-version index edda4c0..2669604 100644 --- a/.mill-version +++ b/.mill-version @@ -1,2 +1 @@ -0.11.0 - +0.11.7-29-f2e220 \ No newline at end of file diff --git a/build.sc b/build.sc index 44d27d6..cfde91e 100644 --- a/build.sc +++ b/build.sc @@ -7,7 +7,7 @@ import com.github.lolgab.mill.mima._ val dottyCommunityBuildVersion = sys.props.get("dottyVersion").toList val scalaVersions = - Seq("2.12.16", "2.13.8", "2.11.12", "3.1.3") ++ dottyCommunityBuildVersion + Seq("2.12.16", "2.13.8", "3.3.1") ++ dottyCommunityBuildVersion trait PPrintModule extends CrossScalaModule with PublishModule with PlatformScalaModule with Mima { @@ -30,8 +30,8 @@ trait PPrintModule ) def ivyDeps = Agg( - ivy"com.lihaoyi::fansi::0.4.0", - ivy"com.lihaoyi::sourcecode::0.3.0" + ivy"com.lihaoyi::fansi::0.5.0", + ivy"com.lihaoyi::sourcecode::0.4.0" ) def compileIvyDeps = Agg.when(crossScalaVersion.startsWith("2"))( @@ -42,7 +42,7 @@ trait PPrintModule trait PPrintTestModule extends ScalaModule with TestModule.Utest { - def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.0") + def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.3") } object pprint extends Module { @@ -53,13 +53,13 @@ object pprint extends Module { object js extends Cross[JsPPrintModule](scalaVersions) trait JsPPrintModule extends PPrintModule with ScalaJSModule { - def scalaJSVersion = "1.10.1" + def scalaJSVersion = "1.12.0" object test extends ScalaJSTests with PPrintTestModule } object native extends Cross[NativePPrintModule](scalaVersions) trait NativePPrintModule extends PPrintModule with ScalaNativeModule { - def scalaNativeVersion = "0.4.5" + def scalaNativeVersion = "0.5.0" object test extends ScalaNativeTests with PPrintTestModule } } diff --git a/project/build.properties b/project/build.properties index c0bab04..a919a9b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.8 diff --git a/readme/Readme.scalatex b/readme/Readme.scalatex index 2388576..e45a1c8 100644 --- a/readme/Readme.scalatex +++ b/readme/Readme.scalatex @@ -258,6 +258,15 @@ display.block ) @sect{Version History} + @sect{0.9.0} + @ul + @li + Support for Scala-Native 0.5.0 + @li + Dropped support for Scala 2.11.x + @li + Minimum version of Scala 3 increased to 3.3.1 + @sect{0.7.3} @ul @li From b0adedbfe3b0effd5b8916b955caeab4ae66d2fc Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 15 Apr 2024 09:37:09 +0800 Subject: [PATCH 2/2] . --- build.sc | 4 ++++ project/build.properties | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sc b/build.sc index cfde91e..aade245 100644 --- a/build.sc +++ b/build.sc @@ -15,6 +15,10 @@ trait PPrintModule def mimaPreviousVersions = Seq("0.7.3", "0.8.0") ++ VcsVersion.vcsState().lastTag.toSeq + def mimaReportBinaryIssues() = + if (this.isInstanceOf[ScalaNativeModule] || this.isInstanceOf[ScalaJSModule]) T.command() + else super.mimaReportBinaryIssues() + def pomSettings = PomSettings( description = artifactName(), organization = "com.lihaoyi", diff --git a/project/build.properties b/project/build.properties index a919a9b..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 +sbt.version=1.9.7