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/CHANGELOG.md b/CHANGELOG.md index dd98136d..c49abd21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,7 +65,7 @@ ## 0.5.1 * Fix multiple object comprehension bugs by @JoshRosen in https://github.com/databricks/sjsonnet/pull/358 -* Update Scala 3 to 3.3.6 by @He-Pin in https://github.com/databricks/sjsonnet/pull/365 +* Update Scala 3 to 3.3.7 by @He-Pin in https://github.com/databricks/sjsonnet/pull/365 * feat: Allow negative start/end on std.slice by @He-Pin in https://github.com/databricks/sjsonnet/pull/367 * Add std.object*Ex methods by @stephenamar-db in https://github.com/databricks/sjsonnet/pull/368 * fix: Fix foldr for str by @He-Pin in https://github.com/databricks/sjsonnet/pull/373 diff --git a/build.mill b/build.mill index de1c028d..3b27e17d 100644 --- a/build.mill +++ b/build.mill @@ -1,4 +1,4 @@ -//| mill-version: 1.0.6-jvm +//| mill-version: 1.1.0-RC1-jvm //| mvnDeps: //| - com.lihaoyi::mill-contrib-jmh:$MILL_VERSION //| - com.lihaoyi::mill-contrib-versionfile:$MILL_VERSION 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/mill b/mill index 53c33987..0343f0dd 100755 --- a/mill +++ b/mill @@ -63,10 +63,6 @@ MILL_BUILD_SCRIPT="" if [ -f "build.mill" ] ; then MILL_BUILD_SCRIPT="build.mill" -elif [ -f "build.mill.scala" ] ; then - MILL_BUILD_SCRIPT="build.mill.scala" -elif [ -f "build.sc" ] ; then - MILL_BUILD_SCRIPT="build.sc" fi # Please note, that if a MILL_VERSION is already set in the environment, @@ -330,4 +326,4 @@ unset MILL_REPO_URL # -D mill.main.cli is for compatibility with Mill 0.10.9 - 0.13.0-M2 # We don't quote MILL_FIRST_ARG on purpose, so we can expand the empty value without quotes # shellcheck disable=SC2086 -exec "${MILL}" $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@" \ No newline at end of file +exec "${MILL}" $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@" diff --git a/mill.bat b/mill.bat index 5b1097a9..f36d8122 100644 --- a/mill.bat +++ b/mill.bat @@ -296,4 +296,4 @@ if not [!MILL_FIRST_ARG!]==[] ( ) rem -D mill.main.cli is for compatibility with Mill 0.10.9 - 0.13.0-M2 -"%MILL%" %MILL_FIRST_ARG% -D "mill.main.cli=%MILL_MAIN_CLI%" %MILL_PARAMS% \ No newline at end of file +"%MILL%" %MILL_FIRST_ARG% -D "mill.main.cli=%MILL_MAIN_CLI%" %MILL_PARAMS% 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