From 7938851273cb2584c272a198f7a60d59f19180de Mon Sep 17 00:00:00 2001 From: Ivar Ness Date: Thu, 12 Dec 2024 14:27:00 +0100 Subject: [PATCH] Added scala-steward friendly versions for scripted test --- build.sbt | 2 ++ .../test-compile/build.sbt | 8 ++++---- .../test-compile/project/Version.scala | 12 +++++++++++ project/ScriptedDependency.scala | 20 +++++++++++++++++++ 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 project/ScriptedDependency.scala diff --git a/build.sbt b/build.sbt index 54f765e656..ef6a1d7c3d 100644 --- a/build.sbt +++ b/build.sbt @@ -289,6 +289,8 @@ lazy val codegenSbt = project "-Xmx1024M", "-Xss4M", "-Dplugin.version=" + version.value, + "-Dzio.test.version=" + ScriptedDependency.Version.zioTest, + "-Dsttp.version=" + ScriptedDependency.Version.sttp, s"-Dproject.dir=${baseDirectory.value.getAbsolutePath}" ) }, diff --git a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt index 3e78d99a07..fadfa95a64 100644 --- a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt +++ b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt @@ -32,13 +32,13 @@ lazy val calibanLib = Seq( ) lazy val sttp = Seq( - "com.softwaremill.sttp.client3" %% "core" % "3.10.1", - "com.softwaremill.sttp.client3" %% "zio" % "3.10.1" + "com.softwaremill.sttp.client3" %% "core" % Version.sttpVersion, + "com.softwaremill.sttp.client3" %% "zio" % Version.sttpVersion ) lazy val zioTest = Seq( - "dev.zio" %% "zio-test" % "2.1.9" % Test, - "dev.zio" %% "zio-test-sbt" % "2.1.9" % Test + "dev.zio" %% "zio-test" % Version.zioTestVersion % Test, + "dev.zio" %% "zio-test-sbt" % Version.zioTestVersion % Test ) // ### App Modules ### diff --git a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/Version.scala b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/Version.scala index d2c7cd4b18..64d3c3eccd 100644 --- a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/Version.scala +++ b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/Version.scala @@ -5,4 +5,16 @@ object Version { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + def zioTestVersion: String = + sys.props.get("zio.test.version") match { + case Some(x) => x + case _ => sys.error("""|The system property 'zio.test.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) + } + def sttpVersion: String = + sys.props.get("sttp.version") match { + case Some(x) => x + case _ => sys.error("""|The system property 'sttp.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) + } } diff --git a/project/ScriptedDependency.scala b/project/ScriptedDependency.scala new file mode 100644 index 0000000000..9baf7bd930 --- /dev/null +++ b/project/ScriptedDependency.scala @@ -0,0 +1,20 @@ +import sbt.* + +//noinspection TypeAnnotation +object ScriptedDependency { + // scala steward should understand these version in context of dependencies described here + object Version { + val sttp = "3.10.1" + val zioTest = "2.1.9" + } + + lazy val sttp = Seq( + "com.softwaremill.sttp.client3" %% "core" % Version.sttp, + "com.softwaremill.sttp.client3" %% "zio" % Version.sttp + ) + + lazy val zioTest = Seq( + "dev.zio" %% "zio-test" % Version.zioTest % Test, + "dev.zio" %% "zio-test-sbt" % Version.zioTest % Test + ) +}