diff --git a/project/build.properties b/project/build.properties index 10fd9ee..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/project/build.properties b/project/build.properties index 10fd9ee..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala index fe6dae7..010cee3 100644 --- a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala +++ b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala @@ -6,6 +6,8 @@ object IWPluginPresets extends AutoPlugin { override def trigger = allRequirements + val scalaJSCrossprojectVersion = "1.1.0" + object autoImport { val addIWProjects: Seq[Def.Setting[_]] = Seq( addSbtPlugin( @@ -22,19 +24,21 @@ addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0") val addScalablyTypedConverter: Def.Setting[_] = addSbtPlugin( - "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta36" + "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta37" ) val addTzdb: Def.Setting[_] = - addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "1.0.1") + addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "2.0.0") val addLocales: Def.Setting[_] = addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "2.6.0") val addScalaJS: Def.Setting[_] = - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") val addScalaJSCrossproject: Def.Setting[_] = - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) val addSbtScalaJSMap: Def.Setting[_] = addSbtPlugin( - "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0" + "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1" ) val addScalaJSSupport: Seq[Def.Setting[_]] = Seq( addScalaJS, @@ -58,12 +62,15 @@ } override def projectSettings: Seq[Def.Setting[_]] = Seq( - addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.18"), - addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2"), + addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.1"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20"), + addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1"), - addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1"), - addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), + addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2"), + addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34"), addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0"), - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) ) } diff --git a/project/build.properties b/project/build.properties index 10fd9ee..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala index fe6dae7..010cee3 100644 --- a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala +++ b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala @@ -6,6 +6,8 @@ object IWPluginPresets extends AutoPlugin { override def trigger = allRequirements + val scalaJSCrossprojectVersion = "1.1.0" + object autoImport { val addIWProjects: Seq[Def.Setting[_]] = Seq( addSbtPlugin( @@ -22,19 +24,21 @@ addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0") val addScalablyTypedConverter: Def.Setting[_] = addSbtPlugin( - "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta36" + "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta37" ) val addTzdb: Def.Setting[_] = - addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "1.0.1") + addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "2.0.0") val addLocales: Def.Setting[_] = addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "2.6.0") val addScalaJS: Def.Setting[_] = - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") val addScalaJSCrossproject: Def.Setting[_] = - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) val addSbtScalaJSMap: Def.Setting[_] = addSbtPlugin( - "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0" + "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1" ) val addScalaJSSupport: Seq[Def.Setting[_]] = Seq( addScalaJS, @@ -58,12 +62,15 @@ } override def projectSettings: Seq[Def.Setting[_]] = Seq( - addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.18"), - addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2"), + addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.1"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20"), + addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1"), - addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1"), - addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), + addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2"), + addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34"), addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0"), - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) ) } diff --git a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala index 0591541..e853c82 100644 --- a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala +++ b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala @@ -14,8 +14,8 @@ override def trigger: PluginTrigger = allRequirements object autoImport { - val scala2Version = "2.13.6" - val scala3Version = "3.0.1" + val scala2Version = "2.13.8" + val scala3Version = "3.1.0" def publishToIW: Seq[Def.Setting[_]] = inThisBuild( List( publishTo := { diff --git a/project/build.properties b/project/build.properties index 10fd9ee..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala index fe6dae7..010cee3 100644 --- a/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala +++ b/sbt-iw-plugin-presets/src/main/scala/works/iterative/sbt/IWPluginPresets.scala @@ -6,6 +6,8 @@ object IWPluginPresets extends AutoPlugin { override def trigger = allRequirements + val scalaJSCrossprojectVersion = "1.1.0" + object autoImport { val addIWProjects: Seq[Def.Setting[_]] = Seq( addSbtPlugin( @@ -22,19 +24,21 @@ addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0") val addScalablyTypedConverter: Def.Setting[_] = addSbtPlugin( - "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta36" + "org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta37" ) val addTzdb: Def.Setting[_] = - addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "1.0.1") + addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "2.0.0") val addLocales: Def.Setting[_] = addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "2.6.0") val addScalaJS: Def.Setting[_] = - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") val addScalaJSCrossproject: Def.Setting[_] = - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) val addSbtScalaJSMap: Def.Setting[_] = addSbtPlugin( - "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0" + "com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1" ) val addScalaJSSupport: Seq[Def.Setting[_]] = Seq( addScalaJS, @@ -58,12 +62,15 @@ } override def projectSettings: Seq[Def.Setting[_]] = Seq( - addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.18"), - addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2"), + addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.1"), + addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20"), + addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1"), - addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1"), - addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28"), + addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2"), + addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34"), addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0"), - addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + addSbtPlugin( + "org.portable-scala" % "sbt-scalajs-crossproject" % scalaJSCrossprojectVersion + ) ) } diff --git a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala index 0591541..e853c82 100644 --- a/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala +++ b/sbt-iw-projects/src/main/scala/works/iterative/sbt/IWScalaProjectPlugin.scala @@ -14,8 +14,8 @@ override def trigger: PluginTrigger = allRequirements object autoImport { - val scala2Version = "2.13.6" - val scala3Version = "3.0.1" + val scala2Version = "2.13.8" + val scala3Version = "3.1.0" def publishToIW: Seq[Def.Setting[_]] = inThisBuild( List( publishTo := { diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 699d38e..739df00 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,4 +1,4 @@ name = iw-project -iw_version = 0.2.0 -sbt_version = 1.5.5 +iw_version = 0.2.2-SNAPSHOT +sbt_version = 1.6.1 java_version = 11