diff --git a/.bazelrc b/.bazelrc
index c0f015f..3ec368b 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -4,10 +4,15 @@ common --noenable_bzlmod
 
 common:ci --color=yes
 
+build --java_language_version="21"
+build --java_runtime_version="remotejdk_21"
+build --tool_java_language_version="21"
+build --tool_java_runtime_version="remotejdk_21"
+
 build:ci --verbose_failures
 build:ci --sandbox_debug
 build:ci --spawn_strategy=standalone
 build:ci --genrule_strategy=standalone
 
 test:ci --test_strategy=standalone
-test:ci --test_output=errors
+test:ci --test_output=all
diff --git a/.bazelversion b/.bazelversion
index 0207705..ec9b27c 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-bazelbuild/7.1.1
+bazelbuild/7.2.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 074c4bd..86238dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,13 +9,13 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-node@v4.0.2
-      - uses: bazel-contrib/setup-bazel@0.8.1
+      - uses: bazel-contrib/setup-bazel@0.8.5
         with:
-          bazelisk-version: 1.19.0
+          bazelisk-version: 1.20.0
       - run: cat .bazelrc.ci >> .bazelrc
       - run: ./scripts/format.sh check
       - run: ./test/run_all_tests.sh ci
@@ -23,13 +23,13 @@ jobs:
   publish:
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     needs: build-and-test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-node@v4.0.2
-      - uses: bazel-contrib/setup-bazel@0.8.1
+      - uses: bazel-contrib/setup-bazel@0.8.5
         with:
-          bazelisk-version: 1.19.0
+          bazelisk-version: 1.20.0
       - run: cat .bazelrc.ci >> .bazelrc
       - name: Parse Tag
         run: |
diff --git a/BUILD.bazel b/BUILD.bazel
index a847d3f..132a92f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,4 +1,17 @@
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")
+load(
+    "@rules_java//toolchains:default_java_toolchain.bzl",
+    "DEFAULT_TOOLCHAIN_CONFIGURATION",
+    "default_java_toolchain",
+)
+
+default_java_toolchain(
+    name = "repository_default_toolchain_21",
+    configuration = DEFAULT_TOOLCHAIN_CONFIGURATION,
+    java_runtime = "@rules_java//toolchains:remotejdk_21",
+    source_version = "21",
+    target_version = "21",
+)
 
 buildifier(
     name = "buildifier",
diff --git a/WORKSPACE b/WORKSPACE
index 680cd71..324901c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,6 +2,21 @@ workspace(name = "twirl_compiler_cli")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+# rules_java
+http_archive(
+    name = "rules_java",
+    sha256 = "647bb31c0d51882549def6f67ee9078df697043406ed4a5144bbdf3b17f91e33",
+    urls = [
+        "https://github.com/bazelbuild/rules_java/releases/download/7.8.0/rules_java-7.8.0.tar.gz",
+    ],
+)
+
+load("@rules_java//java:repositories.bzl", "rules_java_dependencies")
+
+rules_java_dependencies()
+
+register_toolchains("//:repository_default_toolchain_21_definition")
+
 # rules_jvm_external
 rules_jvm_external_version = "6.0"
 
@@ -44,14 +59,14 @@ load(
 twirl_compiler_cli_test_pinned_maven_install()
 
 # higherkindness/rules_scala
-rules_scala_annex_version = "5df571de1c0803736c8e1846fa7a0faa3e21d6c6"
+rules_scala_annex_version = "f781c283796f87779f378785640974f05f543bbc"
 
 http_archive(
     name = "rules_scala_annex",
-    sha256 = "47b700e458de2478428348408b403cccfc93cd2c2b47499275b790d514ad9bd2",
+    integrity = "sha256-D7FHVz5ZzrEdFpII9EW+jb9DMN6/jOjYLsA3twCnWvw=",
     strip_prefix = "rules_scala-{}".format(rules_scala_annex_version),
     type = "zip",
-    url = "https://github.com/higherkindness/rules_scala/archive/{}.zip".format(rules_scala_annex_version),
+    url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version),
 )
 
 bind(
@@ -64,10 +79,6 @@ load(
     "scala_register_toolchains",
     "scala_repositories",
 )
-load(
-    "@rules_scala_annex//rules/scala:workspace_3.bzl",
-    "scala_3_repositories",
-)
 
 scala_repositories()
 
@@ -77,12 +88,6 @@ annex_pinned_maven_install()
 
 scala_register_toolchains()
 
-scala_3_repositories()
-
-load("@annex_3//:defs.bzl", annex_3_pinned_maven_install = "pinned_maven_install")
-
-annex_3_pinned_maven_install()
-
 # Skylib
 skylib_version = "1.5.0"  # update this as needed
 
@@ -162,11 +167,11 @@ load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_depen
 buildifier_dependencies()
 
 # bazel-common
-bazelcommon_version = "5a98ecc1193057db05a19c19a5853f95703749c4"
+bazelcommon_version = "3d605944eb8d238ad8eeecb8cb2021900bfb12ae"
 
 http_archive(
     name = "bazel-common",
-    sha256 = "22ebc5e9595b9739ac56cf83ed3ab1b2186ca9413f80dfc1326e70dc40b89e1e",
+    sha256 = "340197de85263270dd45ab4f9925aa9e3b367abae941208e7bf9a653b31b5b76",
     strip_prefix = "bazel-common-{}".format(bazelcommon_version),
     type = "zip",
     url = "https://github.com/google/bazel-common/archive/{}.zip".format(bazelcommon_version),
diff --git a/twirl-compiler/BUILD.bazel b/twirl-compiler/BUILD.bazel
index 9221cd2..7f07fff 100644
--- a/twirl-compiler/BUILD.bazel
+++ b/twirl-compiler/BUILD.bazel
@@ -2,7 +2,7 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")
 load("@graknlabs_bazel_distribution//maven:rules.bzl", "assemble_maven", "deploy_maven")
 load("@env_vars//:env_vars.bzl", "COMPILER_CLI_ARTIFACT_ID")
 
-artifact_id = COMPILER_CLI_ARTIFACT_ID if len(COMPILER_CLI_ARTIFACT_ID) > 0 else "twirl_compiler_cli"
+artifact_id = COMPILER_CLI_ARTIFACT_ID if (len(COMPILER_CLI_ARTIFACT_ID) > 0) else "twirl_compiler_cli"
 
 scala_library(
     name = "twirl-compiler-lib",
@@ -13,7 +13,6 @@ scala_library(
         "@rules_scala_annex//src/main/scala/higherkindness/rules_scala/common/worker",
         "@twirl_compiler_cli_maven//:com_github_scopt_scopt_3",
         "@twirl_compiler_cli_maven//:org_playframework_twirl_twirl_compiler_3",
-        "@twirl_compiler_cli_maven//:org_scala_lang_scala3_library_3",
     ],
 )
 
diff --git a/twirl_compiler_cli_maven_install.json b/twirl_compiler_cli_maven_install.json
index bd94b9a..2fc4d84 100755
--- a/twirl_compiler_cli_maven_install.json
+++ b/twirl_compiler_cli_maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 149397446,
-  "__RESOLVED_ARTIFACTS_HASH": 281176365,
+  "__INPUT_ARTIFACTS_HASH": 133412692,
+  "__RESOLVED_ARTIFACTS_HASH": -910189128,
   "artifacts": {
     "com.eed3si9n:shaded-jawn-parser_2.13": {
       "shasums": {
@@ -47,10 +47,10 @@
     },
     "com.lihaoyi:sourcecode_2.13": {
       "shasums": {
-        "jar": "0e663be9a6c81e9515bdd07c04831397e38ea648a211e85ad005300fe840a03d",
-        "sources": "6b5cbb110cbaa0a813036e910025912816671644c71db92791e19b279085b078"
+        "jar": "fbace2b994a7184f6b38ee98630be61f21948008a4a56cd83c7f86c1c1de743d",
+        "sources": "3cfacbe17cc04f57d7c397dce829f3b0e3faf282b421444aa7492099ad49cc2d"
       },
-      "version": "0.3.1"
+      "version": "0.4.2"
     },
     "com.lmax:disruptor": {
       "shasums": {
@@ -61,24 +61,24 @@
     },
     "com.swoval:file-tree-views": {
       "shasums": {
-        "jar": "3eccd3cff2d7694aa3969d3a2f3a390dd8ec75243f9b672b2237f77308839273",
-        "sources": "d0802d4038e9693d8f06d76f441a2f899fea4ff5b9155fb03f10c02b5782c0f9"
+        "jar": "fd7373889b7a92cf3e97db36c920ba272aec158a9387b3259fca9f2dfaeda914",
+        "sources": "9cb6411980a3a2d5ae372568b3d201ca47a850227ef7f87a8cb5ad51e2f1f8d5"
       },
-      "version": "2.1.10"
+      "version": "2.1.12"
     },
     "com.thesamet.scalapb:lenses_2.13": {
       "shasums": {
-        "jar": "cf85c64803b72d2663b352301d292220ecdb86755897eb57054cd734bc3a35e3",
-        "sources": "3c29f8432eafb4ff99f24621bd77449d12bc4065ccb47fe1a9aed1cce7218f69"
+        "jar": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
+        "sources": "268a45ae25f08e4236a2194fd180bd29c2607920827d7342bb3f8ac77481010c"
       },
-      "version": "0.11.15"
+      "version": "0.11.17"
     },
     "com.thesamet.scalapb:scalapb-runtime_2.13": {
       "shasums": {
-        "jar": "7a5e7b4c6945d76bb05eb05905fe99b1fc6b58db3cc632d81ea7fb3879efbb77",
-        "sources": "aa6a57ff116853136ef54645221292d06b24ae7e9713c07a91350e14430c7a59"
+        "jar": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
+        "sources": "2e14340da16b0f7dc2c1d41c6b26b3bf0a691e05319a3d08e73b1c5d221dc67f"
       },
-      "version": "0.11.15"
+      "version": "0.11.17"
     },
     "io.github.java-diff-utils:java-diff-utils": {
       "shasums": {
@@ -89,10 +89,10 @@
     },
     "net.java.dev.jna:jna": {
       "shasums": {
-        "jar": "66d4f819a062a51a1d5627bffc23fac55d1677f0e0a1feba144aabdd670a64bb",
-        "sources": "a4c45843e8f60df141c4f37602365a421bb278ca1ef30ba0a043d6a871dd29f4"
+        "jar": "34ed1e1f27fa896bca50dbc4e99cf3732967cec387a7a0d5e3486c09673fe8c6",
+        "sources": "ebd774c761215676cda059fd68240628ef99f4aafa6d355ae00d184855aef134"
       },
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "net.java.dev.jna:jna-platform": {
       "shasums": {
@@ -103,10 +103,10 @@
     },
     "net.openhft:zero-allocation-hashing": {
       "shasums": {
-        "jar": "83636838b75e001a061414f6737141e6200d5e21293842a7a08201ada8988d32",
-        "sources": "d402059ea626c31ccd7006bfa1c39ae934b468e6166aa314178e85eebb0481dd"
+        "jar": "3bc39c640cc8314575de4ebcb1a0bca540516d3c60d49f8de7d638b09868553d",
+        "sources": "4606c9b35ccf0b661b617a0278b42547758c0f15c161bfbeacb2054cd7f57109"
       },
-      "version": "0.10.1"
+      "version": "0.16"
     },
     "org.apache.logging.log4j:log4j-api": {
       "shasums": {
@@ -124,59 +124,66 @@
     },
     "org.fusesource.jansi:jansi": {
       "shasums": {
-        "jar": "d207c1114741e7544a8f17c07b53d91689c0716c54eaf8f3b7149e73b0ec1b09",
-        "sources": "c5f4a5fb41546f9c7b0dd0d5d8ff6dfa396e8cc11049f64f7a96fe24436c59eb"
+        "jar": "2e5e775a9dc58ffa6bbd6aa6f099d62f8b62dcdeb4c3c3bbbe5cf2301bc2dcc1",
+        "sources": "f707511567a13ebf8c51164133770eb5a8e023e1d391bfbc6e7a0591c71729b8"
       },
-      "version": "2.1.0"
+      "version": "2.4.1"
     },
     "org.jline:jline": {
       "shasums": {
-        "jar": "7c3ec8d2c5815188bbaefa4c7c42bc9b8ec172382ca026a4b4f3d113c0b5c3e3",
-        "sources": "8071c15cd25bc76e60d6a51a4d9cb99937d7d8a845c6d52dab15fe0c871163ff"
+        "jar": "421efcde9db04c34b9c03cd66e0460e75e5cdd4a3cafde54ef370049ac092e7c",
+        "sources": "fc452b72d16b34773168a8e5e6aa9d5a54e4bd85fc099e397fe34e4133ab5efd"
+      },
+      "version": "3.25.1"
+    },
+    "org.jline:jline-native": {
+      "shasums": {
+        "jar": "42d5bbe1f546dea248b8c901da7deb9943f76290379552923c9763495bb9f172",
+        "sources": "a3026f0bfe678502ac7f37dba48563d18f1640d585c164f921adbe01fa3152fb"
       },
-      "version": "3.22.0"
+      "version": "3.25.1"
     },
     "org.jline:jline-reader": {
       "shasums": {
-        "jar": "5a794c15884538c312a37c1b49cf025a013d8303ad31eadb53d4f8ae091ef355",
-        "sources": "74eab73d50e5e23c649cd0ea149121f4f33424a6b2497756e2c2f08b363cf5d3"
+        "jar": "26333a275de502adf1dd9e6ea50aa0b4021412c71490df9ed5e88a648886ee89",
+        "sources": "b5164bad15bb8d29566566b12cf4be95b252e18d3056ef96e70b934dbc3872cd"
       },
-      "version": "3.19.0"
+      "version": "3.25.1"
     },
     "org.jline:jline-terminal": {
       "shasums": {
-        "jar": "abdbeafa38c4ccd82578c1f3d08ea48af439eff194d23aa3bae18fbe93b4dcf0",
-        "sources": "249e29e67e300d978491fcfbdbced5c9ecabec8aeaaf36145edfd5e890f34ac6"
+        "jar": "c0f5d70901255da66a94e59778b265d19f9308342578e34c88fc92d1b0c65fef",
+        "sources": "bee7c4d6b7c19365719d56f380c0fe96e0ddc584fa059104afe919e5b3be1d90"
       },
-      "version": "3.19.0"
+      "version": "3.25.1"
     },
     "org.jline:jline-terminal-jansi": {
       "shasums": {
-        "jar": "09566aa3af952a83e2fc2582865b9afe20ad2c6afcafd78c52ae7eacdeb736c9",
-        "sources": "1c68b6d3c2cbb44e7fd04232ff81d5ea760bdb8005ae0f76a803608a88ddaa26"
+        "jar": "1e53923725972413765093aac3cc5eb7d4690eaf758f4067a4972bd59d9e85a5",
+        "sources": "985de41839e641b005cc07b7a92553129757804df7b0318356a6a3515a2306ca"
       },
-      "version": "3.19.0"
+      "version": "3.24.1"
     },
     "org.jline:jline-terminal-jna": {
       "shasums": {
-        "jar": "4a86975ba94756eaf70dea642d8d4c32535b65479050b56c476dc8c6b0519331",
-        "sources": "8bb10c163466591935b8accdf3b1793cc83478a56fa2a767f11810f110c2de30"
+        "jar": "58ca9d719c373206af15775ee3cd5f268136ea0d0c4e009c3e96a6d4612d5c66",
+        "sources": "fe03ffce7be95b6e1aa7e46ddc65b57c4fa4931b04ed65f64e590043c6eabfc5"
       },
-      "version": "3.19.0"
+      "version": "3.25.1"
     },
     "org.playframework.twirl:twirl-compiler_3": {
       "shasums": {
-        "jar": "7847f7e1158ee88c68b1ba0e550a2ff8c84ed2bb63a1ccee75b58f9e1d836dfc",
-        "sources": "eef613e5720d132d4a0ba45ed029ccd64092525d4c4a016495ba74f4daefd53b"
+        "jar": "eec9133f9073f905c73428e3819bb46577bbee89fdc810047bcf5e4dd7916442",
+        "sources": "fc3c3e71b8dbd8e177fd643d314865d4428bcb3d956e81d2041e141cffc6451f"
       },
-      "version": "2.0.4"
+      "version": "2.0.7"
     },
     "org.playframework.twirl:twirl-parser_3": {
       "shasums": {
-        "jar": "d9bfbdb624f2bed10ecbce4670329ce99d8f27328ec3c2b4d5e26e81b5c1e83f",
-        "sources": "9e60607a1cd83a6b1b2802560c2625f843a00d3d89475e69af2df1de6c2f36ee"
+        "jar": "0023da0cf4effda85daf3ade9f3cb2c80c52bd4e6f95736042f6e55bfca6cb68",
+        "sources": "43d776120d01bf097fa54d28affa174397c967168986059a93f8b6a71cfbfd98"
       },
-      "version": "2.0.4"
+      "version": "2.0.7"
     },
     "org.scala-lang.modules:scala-asm": {
       "shasums": {
@@ -187,10 +194,10 @@
     },
     "org.scala-lang.modules:scala-collection-compat_2.13": {
       "shasums": {
-        "jar": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec",
-        "sources": "bc9d66c8f200fda60f88465b656c64959ea9761743868a5bf0371f6aec14130a"
+        "jar": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
+        "sources": "1a60fde64d08f19fe2ce38d99accf6cfefa4eeac3c194fa36ef5f6b89b5f7564"
       },
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "org.scala-lang.modules:scala-parallel-collections_2.13": {
       "shasums": {
@@ -215,108 +222,108 @@
     },
     "org.scala-lang.modules:scala-xml_2.13": {
       "shasums": {
-        "jar": "d122cbf93115ee714570de6a9c18e53001fedb474911d4cb5091758ee51f053a",
-        "sources": "b2f5f01c669f29dc03a8127f7a8ca2cdb40dff3e29ba416e3de4f6bef0480aca"
+        "jar": "4b4d6698c74bff84a105102bbf58390980dc7bb8c40bdea4bc727040b3f966bd",
+        "sources": "8701800048e4b4ca7367f30b8e0b55dccd5181c7dd49657a75671ca798f8007f"
       },
-      "version": "2.1.0"
+      "version": "2.3.0"
     },
     "org.scala-lang:scala-compiler": {
       "shasums": {
-        "jar": "c5a14770370e73a69367b131da1533890200b1e2aa70643b73f9ff31ef2e69ec",
-        "sources": "7cfb1a0c6d939e05f82262c9d73f0fa82a6649d055bf0ba1f5e9d10d640860bb"
+        "jar": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6",
+        "sources": "d6fc2c62cb90e32d5c08a1fbd312e2c5995d2a128f89ce34a5181e52cbff0809"
       },
-      "version": "2.13.11"
+      "version": "2.13.14"
     },
     "org.scala-lang:scala-library": {
       "shasums": {
-        "jar": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1",
-        "sources": "df3f19e71b4d2dd6bb882a6deafb31c7dceaad4f26489b9fd9ca56b493229174"
+        "jar": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3",
+        "sources": "4be0650f427ebf6ff8a462fe634fdc02665d59ec3962c4d98dbf5ac766f1dd4f"
       },
-      "version": "2.13.12"
+      "version": "2.13.14"
     },
     "org.scala-lang:scala-reflect": {
       "shasums": {
-        "jar": "6a46ed9b333857e8b5ea668bb254ed8e47dacd1116bf53ade9467aa4ae8f1818",
-        "sources": "5273592d92d539f2d327276296eb9238a0d8dec4e7efe700f6648678f43f1e4c"
+        "jar": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926",
+        "sources": "94bf451e612d9460dbc7cee4beed84a7e5dd7b86bcb901ee8c78f7cf5e035e01"
       },
-      "version": "2.13.11"
+      "version": "2.13.14"
     },
     "org.scala-lang:scala3-compiler_3": {
       "shasums": {
-        "jar": "c89885646d3f678cb8be1f02cb4a45f58e8283fc9f576fcf5c653a14d3501974",
-        "sources": "ca7bd4fb94f041e71266ffd944ab405cf7f218414d993fb420761e8328a33153"
+        "jar": "c50f6089b1d55b0b7f9fbb2ef9d69f966b07c734d9b96e2b45b5b41b2d1bdd45",
+        "sources": "e887ce463f9fe65b732bc26af1462b8ab7097e8dfbc582ca89823a8cc5bf383e"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-lang:scala3-interfaces": {
       "shasums": {
-        "jar": "1ae200c77435dcbb5dfbd5c2548983f9efce45256a452fb808cf6a0d4b7cb74d",
-        "sources": "04d13fbdeb6e601245b3903e6c889a9dc52bbad39583ed201acc327d68a65aaa"
+        "jar": "3907de290b0e38070f5b5e5598d08d5f302ad0ef9014f7a690ca8e90946ddda3",
+        "sources": "d0bc8086b14a247ed50f56c6e09f9563b907b10a7b2d90b493eed5eb7a5df1c4"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-lang:scala3-library_3": {
       "shasums": {
-        "jar": "643127f7390551a9a74ae2ef8a10d46552d18002297be5b6fea71fb809a70b5c",
-        "sources": "6df2bcf9b4a629402df377f38e74a802a2276c905d6d0ec6cfddcad80bc6e498"
+        "jar": "5d8a8535e11d9dc52400cca0bc1d0edfe9385f15af5710c454ce8ab0e62783a0",
+        "sources": "9780c029947dfb9d8473d9e184185d83e11fe3a7da4578d937decd56b8818987"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-lang:scala3-sbt-bridge": {
       "shasums": {
-        "jar": "63177718f5c3e0be5632fc98cd1278facf33aa4f61597e91becc6a7cc91cc88e",
-        "sources": "0e7bff348079941b98187dc15d2739aca8305cc75f45ad68214c18913496ca54"
+        "jar": "76ae65d99f14e131bd271ac22f805fbb8a39338a95e3fb38fd480fbca01964fe",
+        "sources": "32e4085415e70046fb70b9e05492dc551ea32e47d2df1890611298f91bacec5e"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-lang:tasty-core_3": {
       "shasums": {
-        "jar": "a5c206fc4ebb84950fe1c403d73f42125805fe463104b4fdc2ae14b4e76ee062",
-        "sources": "6171f0c6fa8aaf25ac9b816ba3bf4371ef30c36f370202d4a0bee576e45df7ea"
+        "jar": "3697f3a858c594c5022f2f7751504c069a384b92b4e093e9742bbaa627e0c10f",
+        "sources": "24541ecf51853f3226acd3bfa9a3deaf4d3604fc19f1a1945febcc73f82ca800"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-sbt.jline:jline": {
       "shasums": {
-        "jar": "6d725b356cbfc1131ef2ae3c3555fa4952bf273f245b174a45413f03372f7239",
-        "sources": "e2d0fffa3f8ee802a1bcb043f24f1c9026107d055e58910cefc2ed6dcf567a82"
+        "jar": "40b12ae99b7dc5ae9043f5859ba6e8ecb420afdb7d6ae681243d8448ce5f89f1",
+        "sources": "2986d0ce812334f0cf73a174eaa2198b1c3cb9f37f04232712f5477723d1fbb7"
       },
-      "version": "2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493"
+      "version": "2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79"
     },
     "org.scala-sbt:collections_2.13": {
       "shasums": {
-        "jar": "fff72dd495411fcb8a3a83452f47a8971f0c6aa1afddfd954a6c487858dc15b4",
-        "sources": "e1920052f99a02f2c7c0c62721aed79ebc4664512b8b46351037a9e741fd70e8"
+        "jar": "cd46a99bd4b2a3804eb116fc4685de2fc1c3ed774f0d18fc356ae9474ef71dde",
+        "sources": "609384b481ff6eb67cdc95869b26b32072c3968e603ef68175cbc85a9d532f95"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:compiler-bridge_2.13": {
       "shasums": {
-        "jar": "706b9c2dd76437521475506e250317fa6aa22d88bbfc7435a6cfcba45961a8b1",
-        "sources": "4e7414d70e3567acf78002fa99fc9bf3ef3e68543c481d8a7b292f7bc9d0f542"
+        "jar": "938d03fdd65e9da3f9734fc600db78d6c246678d7d3379f93486986e4a28b4e5",
+        "sources": "e23ff48e7db5498ce0c04ef4172f10b8647d7c23ea1183abf252e6942a6b652f"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:compiler-interface": {
       "shasums": {
-        "jar": "fa586b4b1bdb61c48821cf9568507c1e4d57de3763d27ac2214523b00a173115",
-        "sources": "22200c6be450ea4651088f1d43670d14ee7808aa0c1b07a1ff6bc1104a3d7488"
+        "jar": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
+        "sources": "6a8976e427904a9a4dabe4038cd12d16800f1d31fdc10d72ea2886c26244a452"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:core-macros_2.13": {
       "shasums": {
-        "jar": "1de3a6b6b7bb51b7c576c4d3cadd000d91ec871c16532dac57a1812800f4e1e3",
-        "sources": "6041b933faf51796d06a44b7b77a5511d526b974117b4037c30917070d1d6207"
+        "jar": "fb041b6950843bc6156b5c18a7b82860c0c23d93ae88729c36d184abab0672f1",
+        "sources": "400909352a1124b742a19a699fb98c0ce50a80ffb5aeefe5173b3d212faa3218"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:io_2.13": {
       "shasums": {
-        "jar": "e3df340735a8fac686355bddf0175deb2819a7f79776f2c82d322e236b3389e8",
-        "sources": "7d418af86861c74a0225f667e0aa6a2dbc577a5577da42a7329017b91e311d00"
+        "jar": "1bf7adeb86285466824a2dd4aadb44035ea0c3401dbbaf71af4229129de06764",
+        "sources": "3a978b4f436c9d88ebd8ea07b688ac26cf79abfebcb94d87c71bdb933851c809"
       },
-      "version": "1.9.1"
+      "version": "1.10.0"
     },
     "org.scala-sbt:launcher-interface": {
       "shasums": {
@@ -334,115 +341,115 @@
     },
     "org.scala-sbt:util-control_2.13": {
       "shasums": {
-        "jar": "d435d93a26c7024944299d0e263181a4de19220f7bbd850844a5e7f849119321",
-        "sources": "ae2fa7ad077142e5b31af61756957d5483934e5c59b8e714e7a7c84cec4d34ec"
+        "jar": "1c2c0ca02c9f3d2d3ae57d500fe01ec9cbccd8b1b27f3a4cfddb1f75a8a9cfb2",
+        "sources": "7b0f7831b16aca4cb7633decbd1dd3a00d29d463d60a3109e67de928e3812aa3"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:util-interface": {
       "shasums": {
-        "jar": "cbf6c0db09223e4c6c41afc4c5d831c47e3564e83361df4ba3cb04e439f83675",
-        "sources": "bed4331c842f3c8b1c198ec25ead990fd064e1a0672ae2856aafc2a7593ec1fe"
+        "jar": "12d2254d2b18cdd0f8321dc3c23682af8fa02e41addfbfc371f000eea74e647b",
+        "sources": "5b119510f8bd971452a0fde914edf5cbc0ac7fe6ef6ef7573f7817c6d0496de2"
       },
-      "version": "1.9.2"
+      "version": "1.10.1"
     },
     "org.scala-sbt:util-logging_2.13": {
       "shasums": {
-        "jar": "8f798079c7aed6d9f282493a75b6b1e82c48834f1d03b58d5fc82c2d59ca83a3",
-        "sources": "1f9cb26c90beb88bdc7106b44f5f94ece40ab7ed75920845ee48e19da5b73f7e"
+        "jar": "5cde6b3258b60c7afc56826c3704eb82b4b38a4fb0aa1d1674463bfac290680a",
+        "sources": "4f8e09cf4ee0eea1b2a48ad46b62d8a4454fca8398bbdbc078c9c3291302bd77"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:util-position_2.13": {
       "shasums": {
-        "jar": "43f4c6ec9371d8f7d888e90379bcf9d7ee08f5b7ac1fb25aaef2693d25d53c78",
-        "sources": "c3db60905dea3716cb0796219c901419fddaeb7540c8a1cc41a0663b8a417fda"
+        "jar": "dba13b3fa0e231461f3574829ee0e76a16af45d292b9bb08c59e4988c2a820eb",
+        "sources": "215dc6e981a9957efa8f49e78db8f819dbccbd8fe144b1b1928c43ee5dc8e7c9"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:util-relation_2.13": {
       "shasums": {
-        "jar": "96bae2ea13946da72059ad1e5658b869d1982b85558f42cfddc9c21e5b04a2fe",
-        "sources": "02acfad7f6f521e22c9237c6f845c63567a279d3930c5515b797b6f617a3281a"
+        "jar": "c4299affb9296cd83c18de9f282d664581262fe35e944f41cc627a93f32d64e2",
+        "sources": "2c6a965520b7517202d76a11198558ce9f73ec8a120249c29ba41b6b0bad302e"
       },
-      "version": "1.9.2"
+      "version": "1.10.0"
     },
     "org.scala-sbt:zinc-apiinfo_2.13": {
       "shasums": {
-        "jar": "a9ac1985193d0b1581b6b8a64bda22b84c30290f0304d0de07d050b90eda9982",
-        "sources": "86d98a01c56ffb56834218104dfe1d8f18c17d6f55822983c313878f60c728e7"
+        "jar": "0527f78b3dc6adafc4538550de993d0bbde9ff6865e58eb40ec6bfe2509112ed",
+        "sources": "9c1e320fe6c7cd3ce1deb928a6ca2c5cbf541a5c25722c1cb229b95f92470ab7"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-classfile_2.13": {
       "shasums": {
-        "jar": "80ae2c88dbf55540ecdf692efccd7af5e9bc945f2245cbb580fae3a5eba19a4f",
-        "sources": "5d5fdd033650562a4c93d2e3a7f7ef126b98a477e3503898969ecb5725bc0971"
+        "jar": "1539511a739c2af4850df4023b55497fa0fbc5f95f563641bfeb0637abd29227",
+        "sources": "861f8cc003635935faa92adffe9792f100226539196ccc59d9f36171ef2451c1"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-classpath_2.13": {
       "shasums": {
-        "jar": "a93e75690525b5489c5de3d06d83a5b16b85f138011161751b25e448513e3d49",
-        "sources": "b19c9fa3a9eb25aa0f169499704c680cd9b10bc04132988f2458aaa5ff495cab"
+        "jar": "f465d4a916ebfe66a8ea6be40fb7a8ea02a47f7a6be0af0e8ef2a7157c0f7c49",
+        "sources": "c8c8ce81263c6a1781e0eedfdddb0f8bc750b005a0ed7f88af32bf030ce566da"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-compile-core_2.13": {
       "shasums": {
-        "jar": "7153b283aa6d351b9628ed909e35492cd301a51bd42abd2f60657083d085f752",
-        "sources": "8a9878016e95f93b2f09b539da34a0992675e3563db5811485ebd4fea3073204"
+        "jar": "c89ce34465ff3b37a39726ffaf7696c61eaaf74180ba8719608cad5afec6f2a4",
+        "sources": "164c4f143f9308e184a174b4526bbd19bda55fce35bab5c5073719dfb16f4527"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-core_2.13": {
       "shasums": {
-        "jar": "dfe60b5d52336ca16ee7df42dea0fc056cce97db643773e941c515cfb2ee783d",
-        "sources": "95b328e46e3ed197d76ce6205829c35bfb4f637bc79f955a92459671a0874a36"
+        "jar": "4cf5bd79dbad1c179c1dbd9e6cafdf05a07cb683175b56b983114df479b8b0f9",
+        "sources": "b4f2431d52a9302c32e0cf11ff3553cffac6137df565f5fc8a8c193b9e8ac2cd"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-persist-core-assembly": {
       "shasums": {
-        "jar": "a039032dd2ddd6c82ec76012a9972fda0a9e35c2481ec791b82a60c8fef54807",
-        "sources": "bd69ac85da555f56edab763c13500563d278f7d80f45aed6f3e39a55c7ed9e1b"
+        "jar": "f6975f9fbbecab4c52c111ad992d6e59e710265b208db72a49db8aa7f92e9887",
+        "sources": "d17ad731092349664e49cb567cd739388a79352871314d0201fe5eaa772189e4"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc-persist_2.13": {
       "shasums": {
-        "jar": "1d9df73c7b40247f13db6325e417c1d062ba98e7689a10f57d1d1d9a7904cd59",
-        "sources": "2f9d7a4d67ff05da8dfec9de9497fac794ec82e596c36747ba82f7271845183f"
+        "jar": "05d64bc2d3eb34d2ebd4c8f82e76fc536b17e0030ab719e402a080ea424910ae",
+        "sources": "fa2963e16d4b6b81c3050088b9a8a3ead518028db3dc0cdb990c2419c819ddd9"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scala-sbt:zinc_2.13": {
       "shasums": {
-        "jar": "41eee1dae30599627287303ddb7b3ab5de1147aba20867fb4419dfee605d8a92",
-        "sources": "d20c3cf6861a43b1cda0f1ea452ed79aa4a92b49e67eb974e4e2c2e7b40e0fa1"
+        "jar": "0f7be208027897ba18cb318ac94f3cb4ed8c4ac6f3588b8b15a455dcdb8ffbad",
+        "sources": "b166aaf749bdecb55a7fe723dc82426b42a88c6eb0145c4ee55bae63ba80e939"
       },
-      "version": "1.9.3"
+      "version": "1.10.1"
     },
     "org.scalameta:common_2.13": {
       "shasums": {
-        "jar": "37b50b14b3e5701127781b520f220fae8f7a60afdeb7d47a764e51396c037455",
-        "sources": "baaec8918d4460d1abd6a9d1390446f6dcee4c35acb7a81668648d00f6db9331"
+        "jar": "2a94a8ab2e8151279738a0ed7989c085a5f61636df5087611ca65f083747f5ab",
+        "sources": "6b6c6c24164802bb750caa793ae4fab9857b71f4018f25bdb15eacb324937a7a"
       },
-      "version": "4.9.0"
+      "version": "4.9.7"
     },
     "org.scalameta:parsers_2.13": {
       "shasums": {
-        "jar": "a2550b601df40f0d12545f83a117c1092bcc5a46f7cdf93a74ea36d895c1840a",
-        "sources": "e6de2ef5521523bcc87ee2bbaa2eec080edc3144e9eb4bf3bb6c1b0b4d6f0b7f"
+        "jar": "401cbfef329bbb1a700cd4f3532769c0d552e22fe18781959cee652586fb0410",
+        "sources": "a73f2975408fc0b0846192673b4499a4dffe199f5088fadf1849e87f0304d8fa"
       },
-      "version": "4.9.0"
+      "version": "4.9.7"
     },
     "org.scalameta:trees_2.13": {
       "shasums": {
-        "jar": "3663bf894fbdfceb9bcc6614094f215a41ddffa97a7244e2cc1a1ef014e0428a",
-        "sources": "e972fd28a2458620f80a9346cea0134b19ac8539a86b6aa184022fd19b6c6861"
+        "jar": "c273b84a54fbfef3a48a36ce14310b0e93a7b139a1186019717b25876bd3bb8c",
+        "sources": "81ae77354163118c728f5b7424efd43290e1c2c7b3bc665fb30ffb4978a2f67b"
       },
-      "version": "4.9.0"
+      "version": "4.9.7"
     }
   },
   "dependencies": {
@@ -486,6 +493,9 @@
     "org.jline:jline-reader": [
       "org.jline:jline-terminal"
     ],
+    "org.jline:jline-terminal": [
+      "org.jline:jline-native"
+    ],
     "org.jline:jline-terminal-jansi": [
       "org.fusesource.jansi:jansi",
       "org.jline:jline-terminal"
@@ -841,7 +851,10 @@
       "org.jline.builtins.telnet",
       "org.jline.console",
       "org.jline.console.impl",
+      "org.jline.jansi",
+      "org.jline.jansi.io",
       "org.jline.keymap",
+      "org.jline.nativ",
       "org.jline.reader",
       "org.jline.reader.impl",
       "org.jline.reader.impl.completer",
@@ -850,6 +863,7 @@
       "org.jline.terminal",
       "org.jline.terminal.impl",
       "org.jline.terminal.impl.exec",
+      "org.jline.terminal.impl.ffm",
       "org.jline.terminal.impl.jansi",
       "org.jline.terminal.impl.jansi.freebsd",
       "org.jline.terminal.impl.jansi.linux",
@@ -862,10 +876,19 @@
       "org.jline.terminal.impl.jna.osx",
       "org.jline.terminal.impl.jna.solaris",
       "org.jline.terminal.impl.jna.win",
+      "org.jline.terminal.impl.jni",
+      "org.jline.terminal.impl.jni.freebsd",
+      "org.jline.terminal.impl.jni.linux",
+      "org.jline.terminal.impl.jni.osx",
+      "org.jline.terminal.impl.jni.solaris",
+      "org.jline.terminal.impl.jni.win",
       "org.jline.terminal.spi",
       "org.jline.utils",
       "org.jline.widget"
     ],
+    "org.jline:jline-native": [
+      "org.jline.nativ"
+    ],
     "org.jline:jline-reader": [
       "org.jline.keymap",
       "org.jline.reader",
@@ -876,6 +899,7 @@
     "org.jline:jline-terminal": [
       "org.jline.terminal",
       "org.jline.terminal.impl",
+      "org.jline.terminal.impl.exec",
       "org.jline.terminal.spi",
       "org.jline.utils"
     ],
@@ -1157,6 +1181,7 @@
     ],
     "org.scala-sbt:compiler-bridge_2.13": [
       "scala",
+      "scala.reflect",
       "xsbt"
     ],
     "org.scala-sbt:compiler-interface": [
@@ -1234,6 +1259,7 @@
       "sbt.internal.inc.binary",
       "sbt.internal.inc.binary.converters",
       "sbt.internal.inc.cached",
+      "sbt.internal.inc.consistent",
       "sbt.internal.inc.mappers",
       "sbt.internal.inc.text",
       "xsbti.compile",
@@ -1335,6 +1361,8 @@
       "org.fusesource.jansi:jansi",
       "org.fusesource.jansi:jansi:jar:sources",
       "org.jline:jline",
+      "org.jline:jline-native",
+      "org.jline:jline-native:jar:sources",
       "org.jline:jline-reader",
       "org.jline:jline-reader:jar:sources",
       "org.jline:jline-terminal",
diff --git a/twirl_compiler_cli_test_maven_install.json b/twirl_compiler_cli_test_maven_install.json
index d55f3ac..3b050cc 100755
--- a/twirl_compiler_cli_test_maven_install.json
+++ b/twirl_compiler_cli_test_maven_install.json
@@ -1,14 +1,14 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -1700018420,
-  "__RESOLVED_ARTIFACTS_HASH": 1097032308,
+  "__INPUT_ARTIFACTS_HASH": -1783283511,
+  "__RESOLVED_ARTIFACTS_HASH": -2066172165,
   "artifacts": {
     "org.playframework.twirl:twirl-api_3": {
       "shasums": {
-        "jar": "5c02a078c7456ab3042c81d995c7ab4b39143b9036a5ebf75da95d9079cfdd3f",
-        "sources": "9a3d223c97a7d37d49bd976db930fa968594d481ec2ac19d432b370b8e12a8a0"
+        "jar": "fc91eba419fce88ba5f6b87503cdeef2d81be1299d1e0877696d9a8091fd7568",
+        "sources": "54377f806c7fa59bb546ba860bbe08ab66eac3fbbeb9bf09cda3a4a6b7fdb003"
       },
-      "version": "2.0.4"
+      "version": "2.0.7"
     },
     "org.portable-scala:portable-scala-reflect_2.13": {
       "shasums": {
@@ -33,10 +33,10 @@
     },
     "org.scala-lang:scala3-library_3": {
       "shasums": {
-        "jar": "643127f7390551a9a74ae2ef8a10d46552d18002297be5b6fea71fb809a70b5c",
-        "sources": "6df2bcf9b4a629402df377f38e74a802a2276c905d6d0ec6cfddcad80bc6e498"
+        "jar": "5d8a8535e11d9dc52400cca0bc1d0edfe9385f15af5710c454ce8ab0e62783a0",
+        "sources": "9780c029947dfb9d8473d9e184185d83e11fe3a7da4578d937decd56b8818987"
       },
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "org.scala-sbt:test-interface": {
       "shasums": {
diff --git a/workspace.bzl b/workspace.bzl
index 85cb07d..ec66de2 100644
--- a/workspace.bzl
+++ b/workspace.bzl
@@ -5,8 +5,9 @@ Load 3rd party maven dependencies
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_jvm_external//:specs.bzl", "maven")
 
-scala3_version = "3.4.0"
-twirl_version = "2.0.4"
+zinc_version = "1.10.1"
+scala3_version = "3.4.2"
+twirl_version = "2.0.7"
 
 def twirl_compiler_cli_repositories():
     maven_install(
@@ -14,14 +15,14 @@ def twirl_compiler_cli_repositories():
         artifacts = [
             "org.scala-lang:scala3-compiler_3:{}".format(scala3_version),
             "org.scala-lang:scala3-library_3:{}".format(scala3_version),
-            "org.scala-sbt:compiler-interface:1.9.3",
             # Set neverlink = True to avoid Scala 2 library being pulled on to the compiler classpath
             maven.artifact("org.scala-lang", "scala3-sbt-bridge", scala3_version, neverlink = True),
             "com.github.scopt:scopt_3:4.1.0",
             "org.playframework.twirl:twirl-compiler_3:{}".format(twirl_version),
             "org.scala-lang.modules:scala-parser-combinators_3:2.3.0",
-            "org.scala-sbt:zinc_2.13:1.9.3",
-            "org.scala-sbt:util-interface:1.9.2",
+            "org.scala-sbt:compiler-interface:{}".format(zinc_version),
+            "org.scala-sbt:zinc_2.13:{}".format(zinc_version),
+            "org.scala-sbt:util-interface:{}".format(zinc_version),
         ],
         repositories = [
             "https://repo.maven.apache.org/maven2",