diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index 51386628..c8e3a291 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up environment variables run: | echo "VERSION=$(cat sjsonnet/version)" >> $GITHUB_ENV - echo "SCALA_VERSION=3.3.6" >> $GITHUB_ENV + echo "SCALA_VERSION=3.3.7" >> $GITHUB_ENV - name: JAR Build run: ./mill "sjsonnet.jvm[$SCALA_VERSION].__.assembly" - name: JS Build @@ -67,7 +67,7 @@ jobs: - name: Set up environment variables run: | echo "VERSION=$(cat sjsonnet/version)" >> $GITHUB_ENV - echo "SCALA_VERSION=3.3.6" >> $GITHUB_ENV + echo "SCALA_VERSION=3.3.7" >> $GITHUB_ENV - name: Native Binary Build run: ./mill "sjsonnet.native[$SCALA_VERSION].nativeLink" - name: GraalVM Binary Build diff --git a/build.mill b/build.mill index de1c028d..be9cab52 100644 --- a/build.mill +++ b/build.mill @@ -122,7 +122,10 @@ object bench extends ScalaModule with JmhModule with ScalafmtModule { mainClass = "org.openjdk.jmh.Main", classPath = (runClasspath() ++ generatorDeps()).map(_.path) ++ Seq(jmhGeneratedSources().path, resources.path), - mainArgs = Array("sjsonnet.bench.RegressionBenchmark.main" ,s"-p=path=${regressionCases.mkString(",")}"), + mainArgs = Array( + "sjsonnet.bench.RegressionBenchmark.main", + s"-p=path=${regressionCases.mkString(",")}" + ), cwd = Task.ctx().dest, javaHome = javaHome().map(_.path), jvmArgs = forkedArgs, diff --git a/build.sbt b/build.sbt index 2d3c8917..97958003 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ cancelable in Global := true val options = Seq("-Wconf:origin=scala.collection.compat.*:s", "-Xlint:all") lazy val commonSettings = Seq( - scalaVersion := "3.3.6", + scalaVersion := "3.3.7", scalacOptions ++= options ) diff --git a/readme.md b/readme.md index b08dec8d..b70ea700 100644 --- a/readme.md +++ b/readme.md @@ -248,13 +248,13 @@ mitigate the unfortunate JVM warmup overhead that adds ~1s to every invocation down to 0.2-0.3s. For the simple non-client-server executable, you can use ```bash -./mill -i show sjsonnet[3.3.6].jvm.assembly +./mill -i show sjsonnet[3.3.7].jvm.assembly ``` To create the executable. For the client-server executable, you can use ```bash -./mill -i show sjsonnet[3.3.6].server.assembly +./mill -i show sjsonnet[3.3.7].server.assembly ``` By default, the Sjsonnet background server lives in `~/.sjsonnet`, and lasts 5 diff --git a/sjsonnet/test/resources/go_test_suite/refresh_golden.sh b/sjsonnet/test/resources/go_test_suite/refresh_golden.sh index 046b8035..0695909c 100755 --- a/sjsonnet/test/resources/go_test_suite/refresh_golden.sh +++ b/sjsonnet/test/resources/go_test_suite/refresh_golden.sh @@ -18,7 +18,7 @@ set -e JAVA_OPTS="-Xss100m -Xms2g -XX:+UseG1GC" ROOTDIR=$(git rev-parse --show-toplevel) -JSONNET_BIN="$ROOTDIR/out/sjsonnet/jvm/3.3.6/assembly.dest/out.jar" +JSONNET_BIN="$ROOTDIR/out/sjsonnet/jvm/3.3.7/assembly.dest/out.jar" PARAMS="--no-duplicate-keys-in-comprehension --strict-import-syntax --strict-inherited-assertions --strict-set-operations" if [ $# -eq 0 ] ; then diff --git a/sjsonnet/test/resources/test_suite/refresh_golden.sh b/sjsonnet/test/resources/test_suite/refresh_golden.sh index fc93ee3a..235a3ed5 100755 --- a/sjsonnet/test/resources/test_suite/refresh_golden.sh +++ b/sjsonnet/test/resources/test_suite/refresh_golden.sh @@ -17,7 +17,7 @@ set -e JAVA_OPTS="-Xss100m" -JSONNET_BIN="../../../../out/sjsonnet/jvm/3.3.6/assembly.dest/out.jar" +JSONNET_BIN="../../../../out/sjsonnet/jvm/3.3.7/assembly.dest/out.jar" PARAMS="--no-duplicate-keys-in-comprehension --strict-import-syntax --strict-inherited-assertions --strict-set-operations" if [ $# -eq 0 ] ; then