Merge pull request #19864 Update Zinc used by the Scala plugin to 1.6.1

gradle · Apr 26, 2022 · d794efc · d794efc
2 parents 7d41d7e + 43ada16
commit d794efc
Show file tree

Hide file tree

Showing 20 changed files with 251 additions and 58 deletions.
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -14963,3 +14963,147 @@ o2nOtJP8rT3uqTfXRTBSDneEqtOUKvQ+COCi2Jo2265uQmHRbyPNNKJ80a9zRB/F
 bOKnsFdSMwcHGiNsTzWWafYiaJmZGVg8tK2rkEDrKkizUWCQWOn+UpEbNuCQtFo=
 =CLUL
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub rsa2048/cb3808e03cd602a6dc5b882552931f4b72b4f54c 2014-07-19T14:24:53Z
+	 Hash=528f0bdcd6e6940358e9661f4ceb85e6
+
+uid Roman Leventov <leventov@ya.ru>
+sig  sig  52931f4b72b4f54c 2014-07-19T14:24:53Z
+pub    52931F4B72B4F54C
+uid    Roman Leventov <leventov@ya.ru>
+
+sub    2D8B5968893B9A51
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBFPKf7UBCADNQuTp5/kBaFdYHW5kY28Kb6N3NOX66V6YeemQtuk+v7nUCL7A
+RP351Y5Laz3UmhzxMJCq4OCEDX75Ujb8B+N/o9ubgINfRROF4T1ALtbjakqUl/J8
+qM69BLy2btLRw/NdZbW6gMnaW8RQ51Z3uvG2KyjS2hS3v4TL2z3VpURhtQ8ZGaZZ
+dVxgHPhXvSMwtZFrImNjaDbAMpYLjklLIk8urhL5G0O5XMzTIUtiC9o2YzD//sz/
+bdCDA3vXAIgnshQGdeIuwXGWeiD/uig1Fxq/Y6tHttZuwbJGYftVKQs+M6Q9TeD2
+xNUr/lRd4Kr022xpa33ftKr/6ULpdZ2GDNAlABEBAAG0H1JvbWFuIExldmVudG92
+IDxsZXZlbnRvdkB5YS5ydT6JATgEEwECACIFAlPKf7UCGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEFKTH0tytPVMamMIAMgLSH5decNKpIxYFCMHP05duDJn
+3odVw6m3JfMKmSn7YD5syZkmTPZBWituBqZUeR+fkWSBNiBzy2NU4QiBzu9Fgg3h
+5YLzMmio8xpL+Ek6nK8N49IUPqLxaB0EHWnoNs48JjGyyZ/onw9mFeYXhTsHIvMS
+KrqvSda/K2xkFjUe8mv4v8v2HunNvZRSZuWLvPeOa8eBiE2pt63wxjqiqzX9sUxc
+fdiTbanvFF5tEMomasqRfyCCDYW0HQTmAhhlcz323+axYZ9S80J+CCFHKuwjq2ms
+03ayDPZNgbwCrpOkSrBHm0z8Zosqz4mkhce5BDPo0t9q1be0/gPmchLalfK5AQ0E
+U8p/tQEIANUMg0+IW8Nk5/7LTwSv1r5HTJgz/88wuzBSZwl5vphs1QDNoSUJ+jyC
+Yxu8r/rPGAv82vLLfsqveQwovXPqg6IkTGCqS7hswReLGyFQs19wmS5kPd7cTue6
+DY2GozGpqN54iucvpl+RiEedl2aoPJsczWZcHrPdCcAmmG5+PwjquccDLKPsRStt
+jJGYBoTT3uE6Nss1VwPJrpBaMIgKjJKLUfpAhVMJYh2B/ZCFPAdNTUb5RRf3tBsh
+aAG8BzBBkjmMFQ6NLpW9bY33mXhddr2XilzpwiGBHBMW0IL8gX+lwYgq6k4N1AFN
+wxy5EZhoKvoZrAprkTd1hJqYvvKCwu8AEQEAAYkBHwQYAQIACQUCU8p/tQIbDAAK
+CRBSkx9LcrT1TDCmCACbHE/My4R/BKoAMtGOt72oLBmfEucBjuVNfek4UnZxLUR+
+zTK7k3xa0kxYWamDfZLo4GZnih75G9W2mkB31KlnNwbr6Bs+rBdFQEL7AeRj0V+C
+v89ndq/5lod8oa0ZBkeWBEBUwlAbrkUzpXjD1ww15bobfT199Icw/RssYB60rXmR
+SnZ84U1ip6ssgfzgoxPLX6QFbmtyXmssF9z+iZK4dWne9Qh2umrVtw6SZcsvEZcl
+MQ4d9ofYF8oOLx6dci1rfeDygr5URDIjPkyBhoMyvIS6s3xR7HmiEnthnMZ+VXFa
++BoBG92cJSV516QXSWWjZXNhYZjVqNCOxcVymFfL
+=sEJr
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    ED2378CD09A08CDE
+uid    Guillaume Nodet (CODE SIGNING KEY) <gnodet@gmail.com>
+
+sub    937F1470B7330556
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQINBF7rSgUBEADkkKuARh77nCyorv2LUBebe2i+23AjAN0gkI48HE9dVziQkF3G
+LZwUJdgj4vBlkhETv6uMOqdhl06Pl59UYevQ3KGvK96ZNmcjjxBRpV6TkcvO0fcm
+68pxPJoNoo+JMD6ppxlpLCgnu45EQCWPHKMJjDEV+rIgbqwtmp9pvG2kjR1KqPKK
+VpKCCohTBQwYO/MHAAe5PaVf8e6dKMiJbJB2hAeiOv2zIyl0R1gSu7Qdx86n4Ys3
+LcFUt/Rw61dlLztuKX+ue9QJcPyVv0IZIMG3rKIGOi6enXLa2eQ/HCHQEOI8S2Kg
+ZpDCulAzQIA6+6qlH92EsWr+scNQaQcz8WXOk6Ymy+7qqVbXbYn0pw854iIpZ4TM
+HK5u6135WE/Owf0ssnUP1QEisGBz/lSOOCrQOTGTSX9X45dYOzxbTEGd21YU8fj/
+9HYC0jR++MOjWhnnWXQHJcG/vL2JRPYS9l08R1e6uj3DPs+XsyBt3PAwukBLj4YR
+fVy5VZk5pUX7vy5Kr2QA5HmRAaRWd0UY+kwxm9/cOytGulTRGQE0DTesHdUZLkQU
+qt3yH7gH29vkTmrNiTyTk641ByCTh8TUTPqaPnift+HvR3w94Xj/fBqaM7/GzoNF
+Kmw/Z2s0B7lqfVTinEKW7OJDumE+SBIdrY2PRgAqb+nB/aUU/aSV/r7q8QARAQAB
+tDVHdWlsbGF1bWUgTm9kZXQgKENPREUgU0lHTklORyBLRVkpIDxnbm9kZXRAZ21h
+aWwuY29tPokCTgQTAQoAOBYhBNyYIkxkIaelu4fzRu0jeM0JoIzeBQJe60oFAhsD
+BQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEO0jeM0JoIzeP+EP/1p6n+kwxWe/
+COznthJo64ylhzw+yrM/aLOf5MLYN4DglMWIT+bz4UlolNa0uiybMgwbiZUY3XuL
+4s3jGixubroPy2cUEyvACemDdXIs3PZdvAMNhIDXikI1a4++87nFGBBDVOtoJlUv
+8z5FAWGZ4gKFGcNuEsIjYj/5KyrM+U9g/5YfPtu7kfNFxd87jINSsKOODa3ziJCh
+vX9ieCiFXtDZ79LPpRAr5H6OqxXzUwp0fRePh/UiGsK2zVgcZNQt3KdxU3+lkeAR
+SPTaBm8eNCJUOE5/kMBWd2J/gOanMFnFoldM4oentyBffdKjTCxLscbJFsd+ABrn
+ncoCETDiLLA3jfSVLydWzhaSs65T9DTnPszcFtsqJfOHvOJ1FfZy/apQO6Np/M8S
+zuhVqdgeFpZKf1MzhgzSq5kykombICaChE0OiLphE7DMoz+ec6N61chNwm4AUJhD
+z+hdFTavoWoTacN1QS/FoSSx567kDlaIKg5jcH0jGFynYSeTcy4VoyW3aDN6COtR
+4FWsaQ1r7ffiQMoJj1GMcxmXv+YevVZm9h+8ZwUVagToysMOu4G1dHsTa6TAj1QK
+dXbONtZhhrAXlQWFKORzJnZ3puKwPwHjBBGEdCLIpvzbCTRybFWJOVctwHsrxu8l
+ANs3cCApa1ulT6EqGpiC0WHCUQ4AVxe8iF0EEBEKAB0WIQTqI9sTYNkClIHn8u/s
+3+o8tEk7lAUCXutK3AAKCRDs3+o8tEk7lBxeAJ961NytOloqJMoMFThPZE4rh93x
+jgCgnAZ7Qt33IkKo20XqSmO1blOgl+q5Ag0EXutKBQEQAME/JKyxLTnH8Isw+5jo
+nU1YS0AcC7aDxGl4tiVKo9r/oVfq0+mdCxng89RPRn+7lUe4xWmdwt/eis/BLacW
+ejb4+1dA/RliMhoPjwK5OnelXMBANJfckYP02jPhLlldQIyxKkUVUgpoDuuEGgYq
+FGStSDyZaPoGxHJbNzt9sjwlx3rodU9HOfaIYJ8ZI+awD5DfVPMf4tiGP8/ZFss8
+qe181iF4pPmvlF/t8BNZR9nbMn4pBSWalD7cnOSP2wqEAJRLUAfI+J7Qb/9uK2Bu
+uO4UEVFJvSXrSJ8EKtbcVUmf+rVp8lGc0t61y/m53ExIXfQLUITflg3+Atch4cF2
+Tck6EHc60gy3YMxikXIqqXkBc1slnW4c0Ia0lXsnW1yRDLekyGKi1SrotoAIpbRj
+bceRr32aQ2GVwsIPGECK86F0cmQ0IIPAV/VWRph/o3u+7MWRjygpL85w6t9HR9xJ
+WqPemOjykVEvFtvPfyTusV2XL0K/m3wxeEG/ZdLgbXgJot+UWEMhmbmflghvskQO
+rgpfXXggCEN9FVWN1xENN0Y2yaikvOFvM4hVygy5XXmhWh39zT26IlStGJjzNJjL
+83fo8JrW9UbAL5wy61U1hHiY+hCaV4GZtXCszSLqVnoan/LJszNYJSG9NFuUaYjC
+QtbXhfcpsDejyo/qd5p/kz/bABEBAAGJAjYEGAEKACAWIQTcmCJMZCGnpbuH80bt
+I3jNCaCM3gUCXutKBQIbDAAKCRDtI3jNCaCM3o3eD/0fLl5WSesWt1RbhR2xmMAQ
+0AC4ldCxNnsR3BPd72tg4Gjx6O+HoZubjgwLGlY3HLGdM8FbX2nsieBUadkuJcBu
+KpMe9cTZTYhjEdxKS+tndSPwScLaK02dI6xMRN77L4h2RS0VoYHc6evWUCS4DsUc
+G654wtO8TnkzbMqz3eXaBKyClubRe1sr4HA4FkOqQI483Sngwlr6UTqG0JdbnC1n
+GecpNl2gDxMAenl353szFDy7woFpxVsqbDNp3WWfLupakcpLpFjxZ0XC/VKadEpu
+3n3cwvB/Dmpzpst4Fz4+2toeEXJdnk+aHjNT+T3Q2CsQF41zRCtsejgHMCRjUfUP
+TvxsEGApwFUhY4cO6Inve/JcRTeTcjs6duD7Vf561w6cuj0G7ZUqEtXnJ4XxuZoH
+Wp3fTd6RAduqbE2eCDpbKu1NqAweL73q7DNwV+n8C9lI9fiipyAlG+XlXfwREx0A
+hpPlbKIRjjMYyLnJiPd3dLY72ktirp9N5EG7t8uMTkzJaZ4qXRLkFEw318XEHGmR
+D0488CXWilYvNDXR0PuixKWrcIADu5kOIpF2tLzl/Id2plg5s2nEBe1KHQ576DEc
+wsPhV4rB7bKX6TCh4/MrxJndwLtq3W3eeUEIRg+ZMcOhzUVZdQNbN84vE1Pvj1WS
+x8r+e54Nkx1FPMjEyKsbPA==
+=5N9u
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    18088D07854014B3
+uid    scala-parallel-collections <scala-internals@googlegroups.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBFjQMF4BCACqZ5WTzdpUER+t/zn0iMLKW9a19ikR6m78PXxTsQ8N2okuZVW6
+14Aqa7JUqjfF6PcpOoP9+rGCbMVI3qCM7ui09FDGd/VG+LwAHPoITP2zjUoHseM1
+Emre1j34rFIM4XBgrs/3GUWJjJD15i1qrY09NR049vq1j3JRRGSxrC6aj0kOZ3I+
+QESdh5A2v+oZ3lYRQyZ/knXs5y1ieU5Ie/FbLkvU/oPUmPUB51v7O9jqzkZswO9H
+WrYHfIGWB9tZCHZ/q2uOn8kArdJ2KGZjkpKAVQAwZJUJqZLv4c517omOxkLbKilz
+lwn1X7VSVMsXtvr4hNg10cn0dFE+A+9oGn6BABEBAAG0PXNjYWxhLXBhcmFsbGVs
+LWNvbGxlY3Rpb25zIDxzY2FsYS1pbnRlcm5hbHNAZ29vZ2xlZ3JvdXBzLmNvbT6J
+ARwEEwECAAYFAljQMF4ACgkQGAiNB4VAFLPhvwf+JlFbGTUxo7fxkag+nxvj5hPX
+m+ziln/9TwJ1oSj7aAg+4pRIXMPaR+ws+4G3fAr3S2iNObSpdc6QTNDicVLGtWNR
+HMPC5Jsy6qrqC0pv+B8Ya77PmcfJlq87B9XtWDWGr6uA5oeXUwxhH7I9JMSUIReH
+dLvOlYcEVAstI1JzEeBJGj0ARH6ogtoKWRtlq8zFHon1dUHK2rHck24+eM6XVAhh
+k01ntjsd0OGwL/d2lLil+n0V2AMb+xXWTlBY6vJb63TXXRSpZLpAb9A5M6K+qmFo
+DPuZ3qEwtCHP3W/Mac+mA7AG8NxsZ8zrWgZ4U21S9KUgXnlNAqWM8brQpphNGw==
+=UuEs
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    EFEC7EA866CC43AE
+uid    scala-xml <scala-internals@googlegroups.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBFVQohwBCACi9Hupi/27JFgcRypkruHZNKXa4+QO380B5hp0UFUzJHBqEvUd
+p9niOq30yCgfByLiPv2qr7g1lAg2DltH9WyN5zhp3MzOt/m1w66IwZqgCS364gtD
+56udK2R6YCFMfiJxGXFsSbStfIoD8N5S++NJGv0GuFc2m3sSuTunRFoRWN4Dce0g
+a16nyVR2dPfqOkL7LLzMR4Tl8VQFb36WPrFBmJKzZWxt0r2pQhEDMwItuZeKrBhm
+K/RZWtNqiBO61JCBHfWZdpduUcTjlr5cW+jkRtw8La0qgglJcSN/sErQamAtU6vo
+sdTZ2aQQZnYyVBt00yrLV+9Dq/dBS6cfV9NHABEBAAG0LHNjYWxhLXhtbCA8c2Nh
+bGEtaW50ZXJuYWxzQGdvb2dsZWdyb3Vwcy5jb20+iQEcBBMBAgAGBQJVUKIcAAoJ
+EO/sfqhmzEOuHtkH/25VVvDzMo85E8KlCtsnkD5Alb83zV1XF6+mZaRHikzKkQRz
+phZEGaU6ee3V6CH5qXsmKTU2B1WaOYIdPkuBjwdpRPJbaX0zzrWUCCv1vLKDb+z2
+nlcg0AehMUM3UinbGR6QCh06p3O/tBokJvZM+Ng3pkXtLOS4HphRfindpy7+u1Y/
+szcIQS88AH1g5xPt8nwrh9VQbrYD04K20mLckGIWnjSzgFB9hntMF5arAP9Q1RkS
+52xiOZB8RTZZCkFeHIdMKjjmoM9Vn/3JZzsy8Om4FWYa/l2fEExxKWFupvQetjFk
+VTTOG+T7/WwVPQQ0xQLROgWL7z5UgxHly64WClA=
+=/6/b
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -76,7 +76,7 @@
          <trusted-key id="21f0942275ea159a501d375328852008a47bb995" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd" group="org.sonatype.plexus"/>
          <trusted-key id="2be67ac00d699e04e840b7fe29967e804d85663f">
-            <trusting group="com.eed3si9n" name="shaded-scalajson_2.12"/>
+            <trusting group="com.eed3si9n" name="shaded-scalajson_2.13"/>
             <trusting group="org.scala-sbt"/>
          </trusted-key>
          <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb">
@@ -238,6 +238,7 @@
             <trusting group="org.antlr" name="antlr4-runtime"/>
          </trusted-key>
          <trusted-key id="d9aa7402ba75f78720d975211d185615d0a84648" group="net.sf.saxon" name="Saxon-HE"/>
+         <trusted-key id="dc98224c6421a7a5bb87f346ed2378cd09a08cde" group="org.jline"/>
          <trusted-key id="dddee87612e9fb95f5c8d91e411063a3a0ffd119">
             <trusting group="commons-beanutils"/>
             <trusting group="org.apache-extras.beanshell"/>
@@ -254,6 +255,7 @@
          <trusted-key id="ea313384ca0eba950ea017e937890e298d9a2bfa">
             <trusting group="com.eed3si9n"/>
             <trusting group="org.scala-sbt"/>
+            <trusting group="org.scala-sbt.jline"/>
          </trusted-key>
          <trusted-key id="ec9430d24e1fc30468c773fdca1952b1e682d8a6" group="org.jodd"/>
          <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146">
@@ -657,8 +659,8 @@
             <pgp value="6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac"/>
          </artifact>
       </component>
-      <component group="com.swoval" name="file-tree-views" version="2.1.3">
-         <artifact name="file-tree-views-2.1.3.jar">
+      <component group="com.swoval" name="file-tree-views" version="2.1.7">
+         <artifact name="file-tree-views-2.1.7.jar">
             <pgp value="ee2cfeb6a2aecf44c781c5c3dcd5181297a43d24"/>
          </artifact>
       </component>
@@ -914,6 +916,11 @@
             <sha256 value="be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0" origin="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="net.openhft" name="zero-allocation-hashing" version="0.10.1">
+         <artifact name="zero-allocation-hashing-0.10.1.jar">
+            <pgp value="cb3808e03cd602a6dc5b882552931f4b72b4f54c"/>
+         </artifact>
+      </component>
       <component group="net.rubygrapefruit" name="ansi-control-sequence-util" version="0.3">
          <artifact name="ansi-control-sequence-util-0.3.jar">
             <pgp value="5b131e826582cf79510daa11cd3e539f208832d0"/>
@@ -1454,14 +1461,19 @@
             <pgp value="91268e187cdc92936df90106ac01d965c791b637"/>
          </artifact>
       </component>
-      <component group="org.scala-lang.modules" name="scala-parser-combinators_2.12" version="1.1.2">
-         <artifact name="scala-parser-combinators_2.12-1.1.2.jar">
+      <component group="org.scala-lang.modules" name="scala-parallel-collections_2.13" version="0.2.0">
+         <artifact name="scala-parallel-collections_2.13-0.2.0.jar">
+            <pgp value="c44a68fd10ff456c91e2757d18088d07854014b3"/>
+         </artifact>
+      </component>
+      <component group="org.scala-lang.modules" name="scala-parser-combinators_2.13" version="1.1.2">
+         <artifact name="scala-parser-combinators_2.13-1.1.2.jar">
             <pgp value="dbe61b6ba51dfcaeded256477090af43a5e10d0b"/>
          </artifact>
       </component>
-      <component group="org.scala-lang.modules" name="scala-xml_2.12" version="1.0.6">
-         <artifact name="scala-xml_2.12-1.0.6.jar">
-            <pgp value="2046d870d66f35eed74a3073a3264aa953a97466"/>
+      <component group="org.scala-lang.modules" name="scala-xml_2.13" version="1.2.0">
+         <artifact name="scala-xml_2.13-1.2.0.jar">
+            <pgp value="8d0c8fa7175f26274a6a9f87efec7ea866cc43ae"/>
          </artifact>
       </component>
       <component group="org.scijava" name="native-lib-loader" version="2.0.2">

diff --git a/subprojects/docs/src/docs/userguide/jvm/scala_plugin.adoc b/subprojects/docs/src/docs/userguide/jvm/scala_plugin.adoc
@@ -161,7 +161,7 @@ Unless a task's `scalaClasspath` is configured explicitly, the Scala (base) plug
 
 The Scala plugin uses a configuration named `zinc` to resolve the https://github.com/sbt/zinc[Zinc compiler] and its dependencies.
 Gradle will provide a default version of Zinc, but if you need to use a particular Zinc version, you can change it.
-Gradle supports version 1.2.0 of Zinc and above.
+Gradle supports version 1.6.0 of Zinc and above.
 
 .Declaring a version of the Zinc compiler to use
 ====
@@ -171,7 +171,6 @@ include::sample[dir="snippets/scala/zincDependency/kotlin",files="build.gradle.k
 
 The Zinc compiler itself needs a compatible version of `scala-library` that may be different from the version required by your application.
 Gradle takes care of specifying a compatible version of `scala-library` for you.
-footnote:[Gradle does not support running the Zinc compiler v1.2.0 with Scala 2.11.]
 
 You can diagnose problems with the version of the Zinc compiler selected by running <<viewing_debugging_dependencies.adoc#viewing-debugging-dependencies,dependencyInsight>> for the `zinc` configuration.
 
@@ -180,7 +179,8 @@ You can diagnose problems with the version of the Zinc compiler selected by runn
 |===
 | Gradle version    | Supported Zinc versions | Zinc coordinates | Required Scala version | Supported Scala compilation version
 
-| 6.0 and newer     | link:https://github.com/sbt/zinc[SBT Zinc]. Versions 1.2.0 and above. | `org.scala-sbt:zinc_2.12` | Scala `2.12.x` is required for _running_ Zinc. | Scala `2.10.x` through `2.13.x` can be compiled.
+| 7.5 and newer     | link:https://github.com/sbt/zinc[SBT Zinc]. Versions 1.6.0 and above. | `org.scala-sbt:zinc_2.13` | Scala `2.13.x` is required for _running_ Zinc. | Scala `2.10.x` through `3.x` can be compiled.
+| 6.0 to 7.5        | link:https://github.com/sbt/zinc[SBT Zinc]. Versions 1.2.0 and above. | `org.scala-sbt:zinc_2.12` | Scala `2.12.x` is required for _running_ Zinc. | Scala `2.10.x` through `2.13.x` can be compiled.
 | 1.x through 5.x   | link:https://github.com/typesafehub/zinc[**Deprecated** Typesafe Zinc compiler.] Versions 0.3.0 and above, except for 0.3.2 through 0.3.5.2. | `com.typesafe.zinc:zinc` | Scala `2.10.x` is required for _running_ Zinc. | Scala `2.9.x` through `2.12.x` can be compiled.
 
 |===

diff --git a/subprojects/docs/src/docs/userguide/migration/upgrading_version_7.adoc b/subprojects/docs/src/docs/userguide/migration/upgrading_version_7.adoc
@@ -85,6 +85,13 @@ signing.gnupg.executable=gpg2
 
 - Groovy has been updated to https://groovy-lang.org/releasenotes/groovy-3.0.html[Groovy 3.0.10].
 
+==== Scala Zinc version updated to 1.6.1
+
+Zinc is the Scala incremental compiler that allows Gradle to always compile the minimal set of files needed by the current file changes.
+It takes into account which methods are being used and which have changed, which means it's much more granular than just interfile dependencies.
+
+Zinc version has been updated to the newest available one in order to benefit from all the recent bugfixes.
+Due to that, if you use `zincVersion` setting it's advised to remove it and only use the default version, because Gradle will only be able to compile Scala code with Zinc versions set to 1.6.x or higher.
 
 === Deprecations
 

diff --git a/subprojects/docs/src/snippets/scala/zincDependency/groovy/build.gradle b/subprojects/docs/src/snippets/scala/zincDependency/groovy/build.gradle
@@ -7,11 +7,11 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.scala-lang:scala-library:2.12.1'    
+    implementation 'org.scala-lang:scala-library:2.12.1'
 }
 
 // tag::zinc-dependency[]
 scala {
-    zincVersion = "1.2.1"
+    zincVersion = "1.6.1"
 }
 // end::zinc-dependency[]
diff --git a/subprojects/docs/src/snippets/scala/zincDependency/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/scala/zincDependency/kotlin/build.gradle.kts
@@ -12,6 +12,6 @@ dependencies {
 
 // tag::zinc-dependency[]
 scala {
-    zincVersion.set("1.2.1")
+    zincVersion.set("1.6.1")
 }
 // end::zinc-dependency[]
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy
@@ -118,8 +118,8 @@ class IdeaIntegrationTest extends AbstractIdeIntegrationTest {
     void addsScalaSdkAndCompilerLibraries() {
         executer.withTasks('idea').run()
 
-        hasProjectLibrary('root.ipr', 'scala-sdk-2.10.0', [], [], [], ['compiler-bridge_2.10', 'scala-library-2.10.0', 'scala-compiler-2.10.0', 'scala-reflect-2.10.0', 'compiler-interface', 'util-interface', 'protobuf-java'])
-        hasProjectLibrary('root.ipr', 'scala-sdk-2.11.2', [], [], [], ['compiler-bridge_2.11', 'scala-library-2.11.2', 'scala-compiler-2.11.2', 'scala-reflect-2.11.2', 'scala-xml_2.11-1.0.2', 'scala-parser-combinators_2.11-1.0.2', 'compiler-interface', 'util-interface', 'protobuf-java'])
+        hasProjectLibrary('root.ipr', 'scala-sdk-2.10.0', [], [], [], ['compiler-bridge_2.10', 'scala-library-2.10.0', 'scala-compiler-2.10.0', 'scala-reflect-2.10.0', 'compiler-interface', 'util-interface'])
+        hasProjectLibrary('root.ipr', 'scala-sdk-2.11.2', [], [], [], ['compiler-bridge_2.11', 'scala-library-2.11.2', 'scala-compiler-2.11.2', 'scala-reflect-2.11.2', 'scala-xml_2.11-1.0.2', 'scala-parser-combinators_2.11-1.0.2', 'compiler-interface', 'util-interface'])
         def scalaLibs = [
             'scala3-compiler_3-3.0.1.', 'scala3-sbt-bridge-3.0.1.', 'scala3-interfaces-3.0.1.', 'tasty-core_3-3.0.1.',
             'scala3-library_3-3.0.1.', 'scala-asm-9.1.0-scala-1', 'compiler-interface-1.3.5', 'jline-reader-3.19.0.',
@@ -144,8 +144,8 @@ class IdeaIntegrationTest extends AbstractIdeIntegrationTest {
     void addsScalaFacetAndCompilerLibraries() {
         executer.withTasks('idea').run()
 
-        hasProjectLibrary('root.ipr', 'scala-compiler-2.10.0', ['compiler-bridge_2.10', 'scala-compiler-2.10.0', 'scala-library-2.10.0', 'scala-reflect-2.10.0', 'compiler-interface', 'util-interface', 'protobuf-java'], [], [], [])
-        hasProjectLibrary('root.ipr', 'scala-compiler-2.11.2', ['compiler-bridge_2.11', 'scala-library-2.11.2', 'scala-compiler-2.11.2', 'scala-reflect-2.11.2', 'scala-xml_2.11-1.0.2', 'scala-parser-combinators_2.11-1.0.2', 'compiler-interface', 'util-interface', 'protobuf-java'], [], [], [])
+        hasProjectLibrary('root.ipr', 'scala-compiler-2.10.0', ['compiler-bridge_2.10', 'scala-compiler-2.10.0', 'scala-library-2.10.0', 'scala-reflect-2.10.0', 'compiler-interface', 'util-interface'], [], [], [])
+        hasProjectLibrary('root.ipr', 'scala-compiler-2.11.2', ['compiler-bridge_2.11', 'scala-library-2.11.2', 'scala-compiler-2.11.2', 'scala-reflect-2.11.2', 'scala-xml_2.11-1.0.2', 'scala-parser-combinators_2.11-1.0.2', 'compiler-interface', 'util-interface'], [], [], [])
         def scalaLibs = [
             'scala3-compiler_3-3.0.1.', 'scala3-sbt-bridge-3.0.1.', 'scala3-interfaces-3.0.1.', 'tasty-core_3-3.0.1.',
             'scala3-library_3-3.0.1.', 'scala-asm-9.1.0-scala-1', 'compiler-interface-1.3.5', 'jline-reader-3.19.0.',

diff --git a/subprojects/scala/build.gradle.kts b/subprojects/scala/build.gradle.kts
@@ -29,8 +29,10 @@ dependencies {
     implementation(libs.guava)
     implementation(libs.inject)
 
-    compileOnly("org.scala-sbt:zinc_2.12:1.3.5") {
-        exclude(module="log4j-core") // Because not needed and vulnerable
+    compileOnly("org.scala-sbt:zinc_2.13:1.6.1") {
+        // Because not needed and was vulnerable
+        exclude(module="log4j-core")
+        exclude(module="log4j-api")
     }
 
     testImplementation(project(":base-services-groovy"))

diff --git a/subprojects/scala/src/integTest/groovy/org/gradle/integtests/fixtures/ZincCoverage.groovy b/subprojects/scala/src/integTest/groovy/org/gradle/integtests/fixtures/ZincCoverage.groovy
@@ -20,5 +20,5 @@ import static org.gradle.api.plugins.scala.ScalaBasePlugin.DEFAULT_ZINC_VERSION
 
 
 class ZincCoverage {
-    public static final List<String> ALL_VERSIONS = [DEFAULT_ZINC_VERSION, "1.2.0", "1.2.3", "1.2.5"]
+    public static final List<String> ALL_VERSIONS = [DEFAULT_ZINC_VERSION, "1.6.0"]
 }
diff --git a/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy b/subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy
@@ -208,7 +208,7 @@ task someTask
 
         then:
         def expectedMessage = "The version of 'scala-library' was changed while using the default Zinc version." +
-            " Version 2.10.7 is not compatible with org.scala-sbt:zinc_2.12:" + ScalaBasePlugin.DEFAULT_ZINC_VERSION
+            " Version 2.10.7 is not compatible with org.scala-sbt:zinc_2.13:" + ScalaBasePlugin.DEFAULT_ZINC_VERSION
         if (GradleContextualExecuter.isConfigCache()) {
             // Nested in the CC problems report
             failure.assertHasFailures(2)

diff --git a/.../src/integTest/groovy/org/gradle/scala/compile/UpToDateScalaCompileIntegrationTest.groovy b/.../src/integTest/groovy/org/gradle/scala/compile/UpToDateScalaCompileIntegrationTest.groovy
@@ -54,8 +54,8 @@ class UpToDateScalaCompileIntegrationTest extends AbstractIntegrationSpec {
 
         where:
         newScalaVersion | newZincVersion
-        '2.11.12'       | '1.2.0'
-        '2.12.6'        | '1.2.5'
+        '2.11.12'       | '1.6.0'
+        '2.12.6'        | '1.6.1'
         defaultScalaVersion = '2.11.12'
         defaultZincVersion = ScalaBasePlugin.DEFAULT_ZINC_VERSION
         changedVersion = defaultScalaVersion != newScalaVersion ? 'scala' : 'zinc'