From 60a5a2effa1f8e3f4b7451c7db6503e0760b6858 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Tue, 8 Aug 2023 10:45:18 -0700 Subject: [PATCH] internal: Use AIRSPEC_VERSION file to specify airspec version (#3122) --- AIRSPEC_VERSION | 1 + build.sbt | 2 +- sbt-airframe/build.sbt | 7 ++++--- sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt | 2 +- .../src/sbt-test/sbt-airframe/rpc-finagle/build.sbt | 2 +- sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 AIRSPEC_VERSION diff --git a/AIRSPEC_VERSION b/AIRSPEC_VERSION new file mode 100644 index 0000000000..dee30e0392 --- /dev/null +++ b/AIRSPEC_VERSION @@ -0,0 +1 @@ +23.8.1 \ No newline at end of file diff --git a/build.sbt b/build.sbt index 556f726bf2..6499258e98 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ val targetScalaVersions = SCALA_3 :: uptoScala2 // Add this for using snapshot versions ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") -val AIRSPEC_VERSION = sys.env.getOrElse("AIRSPEC_VERSION", "23.8.0") +val AIRSPEC_VERSION = sys.env.getOrElse("AIRSPEC_VERSION", IO.read(file("AIRSPEC_VERSION")).trim) val SCALACHECK_VERSION = "1.17.0" val MSGPACK_VERSION = "0.9.5" val SCALA_PARSER_COMBINATOR_VERSION = "2.3.0" diff --git a/sbt-airframe/build.sbt b/sbt-airframe/build.sbt index d71ce1a4b9..eb79d3fd79 100644 --- a/sbt-airframe/build.sbt +++ b/sbt-airframe/build.sbt @@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges val AIRFRAME_VERSION = sys.env.getOrElse("AIRFRAME_VERSION", "23.8.0") -val AIRSPEC_VERSION = "23.8.0" +val AIRSPEC_VERSION = sys.env.getOrElse("AIRSPEC_VERSION", IO.read(file("../AIRSPEC_VERSION")).trim) val SCALA_2_12 = "2.12.18" ThisBuild / organization := "org.wvlet.airframe" @@ -70,8 +70,9 @@ lazy val sbtAirframe = scriptedLaunchOpts.value ++ Seq( "-Xmx1024M", - "-Dplugin.version=" + version.value, - "-Dairframe.version=" + AIRFRAME_VERSION + s"-Dplugin.version=${version.value}", + s"-Dairframe.version=${AIRFRAME_VERSION}", + s"-Dairspec.version=${AIRSPEC_VERSION}" ) }, scriptedBufferLog := false diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt index 7b57d46e90..1cc423738f 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt @@ -1,6 +1,6 @@ import wvlet.airframe.sbt.http.AirframeHttpPlugin -val AIRSPEC_VERSION = "23.8.0" +val AIRSPEC_VERSION = sys.props("airspec.version") val buildSettings: Seq[Def.Setting[_]] = Seq( testFrameworks += new TestFramework("wvlet.airspec.Framework"), diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-finagle/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-finagle/build.sbt index af04a9162d..157c0d9c5e 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-finagle/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-finagle/build.sbt @@ -7,7 +7,7 @@ ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") ThisBuild / scalaVersion := "2.12.18" -val AIRSPEC_VERSION = sys.env.getOrElse("AIRSPEC_VERSION", "23.8.0") +val AIRSPEC_VERSION = sys.props("airspec.version") val buildSettings: Seq[Def.Setting[_]] = Seq( testFrameworks += new TestFramework("wvlet.airspec.Framework"), diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt index 1d7ba0380e..46c2db47a1 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt @@ -5,7 +5,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-parse ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") -val AIRSPEC_VERSION = sys.env.getOrElse("AIRSPEC_VERSION", "23.8.0") +val AIRSPEC_VERSION = sys.props("airspec.version") val buildSettings: Seq[Def.Setting[_]] = Seq( testFrameworks += new TestFramework("wvlet.airspec.Framework"),