diff --git a/build.sbt b/build.sbt index 731e2f9..ca80d75 100644 --- a/build.sbt +++ b/build.sbt @@ -3,14 +3,17 @@ ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -inThisBuild(List( - publishTo := { - val base = "https://dig.iterative.works/maven/" - if (version.value.endsWith("SNAPSHOT")) Some("snapshots" at base + "snapshots") - else Some("releases" at base + "releases") - }, - credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") -)) +inThisBuild( + List( + publishTo := { + val base = "https://dig.iterative.works/maven/" + if (version.value.endsWith("SNAPSHOT")) + Some("snapshots" at base + "snapshots") + else Some("releases" at base + "releases") + }, + credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") + ) +) lazy val `sbt-iw-plugin-presets` = (project in file("sbt-iw-plugin-presets")) .enablePlugins(SbtPlugin, BuildInfoPlugin) @@ -44,7 +47,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0"), addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "3.0.0"), - addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0") + addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") ) lazy val `iw-project-support` = (project in file(".")) diff --git a/build.sbt b/build.sbt index 731e2f9..ca80d75 100644 --- a/build.sbt +++ b/build.sbt @@ -3,14 +3,17 @@ ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -inThisBuild(List( - publishTo := { - val base = "https://dig.iterative.works/maven/" - if (version.value.endsWith("SNAPSHOT")) Some("snapshots" at base + "snapshots") - else Some("releases" at base + "releases") - }, - credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") -)) +inThisBuild( + List( + publishTo := { + val base = "https://dig.iterative.works/maven/" + if (version.value.endsWith("SNAPSHOT")) + Some("snapshots" at base + "snapshots") + else Some("releases" at base + "releases") + }, + credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") + ) +) lazy val `sbt-iw-plugin-presets` = (project in file("sbt-iw-plugin-presets")) .enablePlugins(SbtPlugin, BuildInfoPlugin) @@ -44,7 +47,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0"), addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "3.0.0"), - addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0") + addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") ) lazy val `iw-project-support` = (project in file(".")) diff --git a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala index e7dfa95..b69ca40 100644 --- a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala +++ b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala @@ -197,6 +197,9 @@ .settings( addScalaJavaTime, addScalaJavaLocales, + // Newer tzdata break the plugin because of format changes + // Remove when fixed https://github.com/cquiroz/sbt-tzdb/issues/186 + dbVersion := TzdbPlugin.Version("2022a"), localesFilter := locales.LocalesFilter .Selection("en-US", "en", "cs-CZ", "cs"), currencyFilter := locales.CurrencyFilter.Selection( diff --git a/build.sbt b/build.sbt index 731e2f9..ca80d75 100644 --- a/build.sbt +++ b/build.sbt @@ -3,14 +3,17 @@ ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -inThisBuild(List( - publishTo := { - val base = "https://dig.iterative.works/maven/" - if (version.value.endsWith("SNAPSHOT")) Some("snapshots" at base + "snapshots") - else Some("releases" at base + "releases") - }, - credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") -)) +inThisBuild( + List( + publishTo := { + val base = "https://dig.iterative.works/maven/" + if (version.value.endsWith("SNAPSHOT")) + Some("snapshots" at base + "snapshots") + else Some("releases" at base + "releases") + }, + credentials += Credentials(Path.userHome / ".sbt" / ".iw-credentials") + ) +) lazy val `sbt-iw-plugin-presets` = (project in file("sbt-iw-plugin-presets")) .enablePlugins(SbtPlugin, BuildInfoPlugin) @@ -44,7 +47,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0"), addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "3.0.0"), - addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0") + addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") ) lazy val `iw-project-support` = (project in file(".")) diff --git a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala index e7dfa95..b69ca40 100644 --- a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala +++ b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWMaterialsPlugin.scala @@ -197,6 +197,9 @@ .settings( addScalaJavaTime, addScalaJavaLocales, + // Newer tzdata break the plugin because of format changes + // Remove when fixed https://github.com/cquiroz/sbt-tzdb/issues/186 + dbVersion := TzdbPlugin.Version("2022a"), localesFilter := locales.LocalesFilter .Selection("en-US", "en", "cs-CZ", "cs"), currencyFilter := locales.CurrencyFilter.Selection( diff --git a/sbt-iw-projects/src/main/scala/works/iterative/sbt/TpolecatFixPlugin.scala b/sbt-iw-projects/src/main/scala/works/iterative/sbt/TpolecatFixPlugin.scala new file mode 100644 index 0000000..17c89c8 --- /dev/null +++ b/sbt-iw-projects/src/main/scala/works/iterative/sbt/TpolecatFixPlugin.scala @@ -0,0 +1,17 @@ +package works.iterative.sbt + +import _root_.sbt._ +import _root_.sbt.Keys._ +import _root_.io.github.davidgregory084.TpolecatPlugin +import org.scalajs.sbtplugin.ScalaJSPlugin + +// Fix tpolecat's options leaving out scalajs for Scala 3, see https://github.com/typelevel/sbt-tpolecat/issues/102 +object TpolecatFixPlugin extends AutoPlugin { + override def requires = TpolecatPlugin && ScalaJSPlugin + override def trigger = allRequirements + override def projectSettings = Seq( + scalacOptions ++= { + if (scalaVersion.value.startsWith("3")) Seq("-scalajs") else Seq.empty + } + ) +}