diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") 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 5770329..c05717e 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 @@ -19,10 +19,10 @@ val play = "2.8.8" val playJson = "2.9.2" val scalaTest = "3.2.9" - val zio = "1.0.9" - val zioConfig = "1.0.6" + val zio = "1.0.12" + val zioConfig = "1.0.10" val zioJson = "0.1.5" - val zioLogging = "0.5.11" + val zioLogging = "0.5.12" val laminar = "0.13.1" } diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") 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 5770329..c05717e 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 @@ -19,10 +19,10 @@ val play = "2.8.8" val playJson = "2.9.2" val scalaTest = "3.2.9" - val zio = "1.0.9" - val zioConfig = "1.0.6" + val zio = "1.0.12" + val zioConfig = "1.0.10" val zioJson = "0.1.5" - val zioLogging = "0.5.11" + val zioLogging = "0.5.12" val laminar = "0.13.1" } 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 3e2ea8e..0591541 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 @@ -16,6 +16,17 @@ object autoImport { val scala2Version = "2.13.6" val scala3Version = "3.0.1" + def publishToIW: Seq[Def.Setting[_]] = 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") + ) + ) } import autoImport._ diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") 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 5770329..c05717e 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 @@ -19,10 +19,10 @@ val play = "2.8.8" val playJson = "2.9.2" val scalaTest = "3.2.9" - val zio = "1.0.9" - val zioConfig = "1.0.6" + val zio = "1.0.12" + val zioConfig = "1.0.10" val zioJson = "0.1.5" - val zioLogging = "0.5.11" + val zioLogging = "0.5.12" val laminar = "0.13.1" } 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 3e2ea8e..0591541 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 @@ -16,6 +16,17 @@ object autoImport { val scala2Version = "2.13.6" val scala3Version = "3.0.1" + def publishToIW: Seq[Def.Setting[_]] = 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") + ) + ) } import autoImport._ diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 6d58440..555faed 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,6 +1,6 @@ name = ff-project -iw_version = 0.1.0-SNAPSHOT +iw_version = 0.1.3 sbt_version = 1.5.5 java_version = 11 -ff_version = 0.1.0-SNAPSHOT +ff_version = 0.1.3 sbt_gitlab_version = 0.0.6 diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") 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 5770329..c05717e 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 @@ -19,10 +19,10 @@ val play = "2.8.8" val playJson = "2.9.2" val scalaTest = "3.2.9" - val zio = "1.0.9" - val zioConfig = "1.0.6" + val zio = "1.0.12" + val zioConfig = "1.0.10" val zioJson = "0.1.5" - val zioLogging = "0.5.11" + val zioLogging = "0.5.12" val laminar = "0.13.1" } 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 3e2ea8e..0591541 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 @@ -16,6 +16,17 @@ object autoImport { val scala2Version = "2.13.6" val scala3Version = "3.0.1" + def publishToIW: Seq[Def.Setting[_]] = 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") + ) + ) } import autoImport._ diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 6d58440..555faed 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,6 +1,6 @@ name = ff-project -iw_version = 0.1.0-SNAPSHOT +iw_version = 0.1.3 sbt_version = 1.5.5 java_version = 11 -ff_version = 0.1.0-SNAPSHOT +ff_version = 0.1.3 sbt_gitlab_version = 0.0.6 diff --git a/src/main/g8/project/project/plugins.sbt b/src/main/g8/project/project/plugins.sbt index 1942a84..c4574be 100644 --- a/src/main/g8/project/project/plugins.sbt +++ b/src/main/g8/project/project/plugins.sbt @@ -1,3 +1,5 @@ -resolvers += "IW plugin repository" at "https://maven.pkg.github.com/iterative-works/iw-project-support" +resolvers += "IW releases" at "https://dig.iterative.works/maven/releases" + +resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" addSbtPlugin("works.iterative.sbt" % "sbt-iw-plugin-presets" % "$iw_version$") diff --git a/.gitignore b/.gitignore index 239f822..9ff99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ # semanticdb *.semanticdb +/.direnv/ diff --git a/build.sbt b/build.sbt index 19ff05a..645123f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,16 @@ Global / semanticdbEnabled := true -ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "works.iterative" ThisBuild / versionScheme := Some("strict") -ThisBuild / githubOwner := "iterative-works" -ThisBuild / githubRepository := "iw-project-support" + +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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e085f6d..49d7c7f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } 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 055249d..8b46e53 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 @@ -7,8 +7,12 @@ override def trigger = allRequirements object autoImport { - val addIWProjects: Def.Setting[_] = addSbtPlugin( + val addIWProjects: Seq[Def.Setting[_]] = Seq( + addSbtPlugin( "works.iterative.sbt" % "sbt-iw-projects" % BuildInfo.version + ), + resolvers += "IW releases" at "https://dig.iterative.works/maven/releases", + resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" ) val addScalaJSBundler: Def.Setting[_] = addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") 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 5770329..c05717e 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 @@ -19,10 +19,10 @@ val play = "2.8.8" val playJson = "2.9.2" val scalaTest = "3.2.9" - val zio = "1.0.9" - val zioConfig = "1.0.6" + val zio = "1.0.12" + val zioConfig = "1.0.10" val zioJson = "0.1.5" - val zioLogging = "0.5.11" + val zioLogging = "0.5.12" val laminar = "0.13.1" } 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 3e2ea8e..0591541 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 @@ -16,6 +16,17 @@ object autoImport { val scala2Version = "2.13.6" val scala3Version = "3.0.1" + def publishToIW: Seq[Def.Setting[_]] = 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") + ) + ) } import autoImport._ diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 6d58440..555faed 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,6 +1,6 @@ name = ff-project -iw_version = 0.1.0-SNAPSHOT +iw_version = 0.1.3 sbt_version = 1.5.5 java_version = 11 -ff_version = 0.1.0-SNAPSHOT +ff_version = 0.1.3 sbt_gitlab_version = 0.0.6 diff --git a/src/main/g8/project/project/plugins.sbt b/src/main/g8/project/project/plugins.sbt index 1942a84..c4574be 100644 --- a/src/main/g8/project/project/plugins.sbt +++ b/src/main/g8/project/project/plugins.sbt @@ -1,3 +1,5 @@ -resolvers += "IW plugin repository" at "https://maven.pkg.github.com/iterative-works/iw-project-support" +resolvers += "IW releases" at "https://dig.iterative.works/maven/releases" + +resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" addSbtPlugin("works.iterative.sbt" % "sbt-iw-plugin-presets" % "$iw_version$") diff --git a/version.sbt b/version.sbt new file mode 100644 index 0000000..0aea67a --- /dev/null +++ b/version.sbt @@ -0,0 +1 @@ +ThisBuild / version := "0.1.3"