Update Metals To 0.10.6

* Change JRE version support to <= 17 * https://scalameta.org/metals/blog/2021/09/06/tungsten/ * Fix JREMajorVersion for "Early Adopter" (or "Early Access"?) version numbers, e.g. "18-ea". * Update default JRE options to work with JRE >= 8 and <= 17, this is mostly changing `-XX:MaxRAMPercentage=25` to `-XX:MaxRAMPercentage=25.0`, which permits usage on JRE 8. * Update `metals.install` notice to reference correct version constraints and changes to Java options.
author: David Strawn 2021-09-13 10:19:39 -0600
committer: David Strawn 2021-09-13 10:19:39 -0600
commit: 03495d51dbf9fc359aa9e22f8c993b3a3cdc6333 (patch)
tree: 69a41c9cf10469164be9fcf80fd00a28d6dbe28a
parent: 2f66d089f9a9f6313939cd1d364483717f0fd3f6 (diff)
download: aur-03495d51dbf9fc359aa9e22f8c993b3a3cdc6333.tar.gz
7 files changed, 90 insertions, 72 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41984751c428..07b88c86a0fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = metals
 	pkgdesc = Language Server For Scala
-	pkgver = 0.10.5
+	pkgver = 0.10.6
 	pkgrel = 1
 	url = https://scalameta.org/metals/
 	install = metals.install
@@ -10,11 +10,11 @@ pkgbase = metals
 	makedepends = sed
 	makedepends = grep
 	makedepends = coreutils
-	depends = java-environment<=11
+	depends = java-environment<=17
 	depends = findutils
 	depends = python
 	optdepends = bloop
-	source = https://github.com/scalameta/metals/archive/v0.10.5.tar.gz
+	source = metals-0.10.6.tar.gz::https://github.com/scalameta/metals/archive/v0.10.6.tar.gz
 	source = metals-client.sh
 	source = metals-emacs.sh
 	source = metals-vim.sh
@@ -22,53 +22,53 @@ pkgbase = metals
 	source = metals-sublime.sh
 	source = version-fix.patch
 	source = JREMajorVersion.java
-	md5sums = 6d55b0f54d5152ea6888d46ebbf35332
-	md5sums = b8c712df94a74a7564ec8107895688b0
+	md5sums = f090a1d85273573049c93514d973e11d
+	md5sums = af44c1849b0dcfed177bd6fae1d30413
 	md5sums = ad97e9262c7b22dd71b017a6402f612a
 	md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
 	md5sums = 83b5669127510100d6e7ab4094877a6e
 	md5sums = 38c34ab96f6cf637f7be9f72b7400983
-	md5sums = 0f9a87db09ffd2be1fb42a1a78b9c946
-	md5sums = 8a6b25ac88a8836a68d9dc55b4d17eda
-	sha1sums = 367586cb3a8c857ad8b254589d547484018857d4
-	sha1sums = d279b6e2667d0c0e4d9fb5d7aa364baf247d9e94
+	md5sums = 4a745a2036090eb0860ed0b487505a94
+	md5sums = 8ddf6b592e6167de2df073016a9b042d
+	sha1sums = 8c31212f3cca88a9ffed505974e398b6dcfa4294
+	sha1sums = 8989fcd5e0d6f25976fc2646d7542d0ed2f04f28
 	sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
 	sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
 	sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
 	sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
-	sha1sums = 7716e15d6edf5edd8c52c6e51aa6b4ce83b7dacb
-	sha1sums = c95efcaad9c6417d858575a381648a4c9a928a46
-	sha224sums = bc8b547588626a4d1be64b8ce482b0ca85844ae6016a9eaa7f054264
-	sha224sums = 1ab773e110957c39faa0c1a2f923fc2c891ed354572b2d50e438ee04
+	sha1sums = 73e9ba8d4936d39ae5d36ecd9c090d9ddef723d2
+	sha1sums = 1f659a83c4403c038bb33026fc69a73c4ac4d76d
+	sha224sums = 32d5df71610a7b7f4ba61dd891d9fb2911f7933441a2fc3aa196200a
+	sha224sums = 77db230a65c8b75858ce6f4f52a3ae709072004ae5a0fc3d1072e415
 	sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
 	sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
 	sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
 	sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
-	sha224sums = 6f7200cc8b17533ad09913cb87a1a609849fb8dc4430ec605b223922
-	sha224sums = 1566b25eee6a99d3e6ca78497e7393c8466bf6e919681054ba14c4af
-	sha256sums = 5955c57be49f161288a9adaa4934dccd67ff50e4aa36fdbd4a65a877cd2babc6
-	sha256sums = ab7c3c46650d64ed40f6a155be20371ed484aad4615378e429875ca80e381f78
+	sha224sums = 18ed3c11d4b66d82530802c73ea37f89ca1d8936e2494a658b69c000
+	sha224sums = d48db6d9e58e19bbd7715aef204c04d01953479e9d5ca7aba94b8f36
+	sha256sums = 21ede625dc061e4de3ef13f272dc9567924782b8a24d7d166859ffa38f548db3
+	sha256sums = 3d533b5191154ed9d8dbcc27a286f8da6a0e6031bca0e6d6fc0987f9fe6484c0
 	sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
 	sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
 	sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
 	sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
-	sha256sums = c95e164e7a6046ad7a0481210b5be4f67c9929e63bd16dafbf5ca6e0cefeb670
-	sha256sums = 379144a4e426683565c46916adb105fe1afa1e1daf98f557883feeca1aa95d43
-	sha384sums = 87e34583e5f31020ea890eefc0109d1a912540350833bb2604fc4c593473c125f5eacc9572270661ce58b9061e59b9dd
-	sha384sums = 85ae632b2bb14380ab10b8c8c767d98c9b88a1bbb3711d4dc8433c4aac47af525471635166baa6600b20166628aadf41
+	sha256sums = af21b0b4de4f67888bf111cd40092599bb1425ad1a62b9b24b036f6487459646
+	sha256sums = 9b5fcbcd9628d2c003d48d8e5dbbc3cb1de8dd4fa4c272cafed4f1d027e67bdb
+	sha384sums = ce570663e4b49a50e2fc7a4c04d83f88532eedd787cef565606844bb73c16eb1d0414ddeb59ec23b578a1f592144bd82
+	sha384sums = d2bdfdbba7f0aa0e6589b43aaffd0c7b1fc5c7231767e30c4680fa9a2e5166ed94e4bdfe6e4465613f739854660ebecb
 	sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
 	sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
 	sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
 	sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
-	sha384sums = dcbb9fd7aec75c428682275067f7d721c80c570e57752ccd91932531a3260b02a18ea0d9ac60a2274aaf2960f760677f
-	sha384sums = eba6ead826268c42600ba41098bfcfaa1a13e4f7f5f8f367af6836995c41ad125ef5c5464242727b1c0f10caa3b4de37
-	sha512sums = f3b1f08d681f73b0e9834040da3d018092c2f7c929aa91ab542ab31a56631c8e796c7a74caf119b3b52133d424b1db550f711227b7aab5bf46d76099190c5a96
-	sha512sums = e1b39277bb1c594a9a05657e0a071a3fd67157b33e37fce13368765d170e776c8f9d3a12073bb16b6057d5c62f40724339443ae21d2bf7e378b2bffcf282a26d
+	sha384sums = ba99b93a50fbf90ef0004832ea6ee9e3620b4a406b2637ccd181c4161a36aa9c67384b54a8dd6b4fefda9072a9acd027
+	sha384sums = 021c3837df318b14a5b4547717b4b19436a07edf61d735ce05d2fe57f23ca2d1c9787c8b86a08f43547b6d92f935476c
+	sha512sums = 05c7b90e58d2a250ddc1be51c9194cb0631428ff698a055c8a577b165c6d7492cafeee6e7227d67c9fad5a66d1abc93ee30a528c0b4573c3e25d8bcf7a24e3f1
+	sha512sums = d0539dfd53e95bea29cb92d634dd2df259d9db8ad568c6ec368ddaeaf53e1f6b946218820bd2aa0e4726a21225e863dc55b2ddd8a0ee12fc1426fdd34feb856a
 	sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
 	sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
 	sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
 	sha512sums = 9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b
-	sha512sums = a8ca3f025673e0662514606343ab0ef4d8d4cb560a579b6cf6516f771889b484adce44ee4a2f7014ec753c6c8dc1905925dfc03a800b342ba6fe4f800a58b3a8
-	sha512sums = 584a795a05ddae117bbd777963ac38189f2e5929a1c69bd143d3acf6f02e42fb7eef8b74f989e560dcd49f8fe469984b60d6d7bbb4f82ee173e95d8a237551af
+	sha512sums = 3bc8afda9d378d5a46a76a04222bef1b0136fa5a7647bc4c1c29997f89ef173ebe03677109567f5359d2d8765aada68c9b7cf5efbb19e67a8bf705b5bbda5174
+	sha512sums = 7e9f198f0141cf750cb67ac0b350fb0fa2c204f5a8a271e475b2699ecf0f46cf20219cea3fd12bb5edeb8fb08159069d03afc1dd6626703e8eeddee9b365d191
 
 pkgname = metals
diff --git a/.gitignore b/.gitignore
index 481fb8701898..4eb7befbdb14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /src/
 /pkg/
 /*.log
-/metals-*.tar.xz
+/metals-*.tar.*
 /v*.tar.gz
 /*.pkg.tar.zst
 /*.class
diff --git a/JREMajorVersion.java b/JREMajorVersion.java
index 92b8de59fffc..117192718b19 100644
--- a/JREMajorVersion.java
+++ b/JREMajorVersion.java
@@ -1,10 +1,28 @@
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
 public final class JREMajorVersion {
 
+  private static final Pattern sanitizePattern =
+    Pattern.compile("^\\s*([0-9]+(\\.[0-9]+)*)");
+
   private static final String bugLink =
     "Please report this as a bug to https://aur.archlinux.org/packages/metals/";
 
+  private static String sanitizeVersion(final String value) {
+    final Matcher m = JREMajorVersion.sanitizePattern.matcher(value);
+    if (m.find()) {
+      return m.group(1);
+    } else {
+      throw new AssertionError("Unable to parse valid version number from input: " +
+                               value +
+                               ". This may be a bug in the Arch Linux package of metals, or something very odd in the JRE you are using. " +
+                               JREMajorVersion.bugLink);
+    }
+  }
+
   private static String getMajorVersion() {
-    final String javaVersion = System.getProperty("java.version");
+    final String javaVersion = sanitizeVersion(System.getProperty("java.version"));
     if (javaVersion == null) {
       throw new AssertionError("System property \"java.version\" is null. " + JREMajorVersion.bugLink);
     } else {
diff --git a/PKGBUILD b/PKGBUILD
index fbe83c799864..42c4cd4f4fd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 # Maintainer: David Strawn <isomarcte a__t gmail d__o__t c__o__m>
 pkgname='metals'
-pkgver='0.10.5'
+pkgver='0.10.6'
 pkgrel=1
 epoch=
 pkgdesc='Language Server For Scala'
@@ -13,7 +13,7 @@ url='https://scalameta.org/metals/'
 arch=(any)
 license=('Apache')
 groups=()
-depends=('java-environment<=11' 'findutils' 'python')
+depends=('java-environment<=17' 'findutils' 'python')
 makedepends=('sbt' 'sed' 'grep' 'coreutils')
 checkdepends=()
 optdepends=('bloop')
@@ -24,56 +24,56 @@ backup=()
 options=()
 install=
 changelog=
-source=("https://github.com/scalameta/$pkgname/archive/v$pkgver.tar.gz" 'metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh' 'version-fix.patch' 'JREMajorVersion.java')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/scalameta/$pkgname/archive/v$pkgver.tar.gz" 'metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh' 'version-fix.patch' 'JREMajorVersion.java')
 noextract=()
-md5sums=('6d55b0f54d5152ea6888d46ebbf35332'
-         'b8c712df94a74a7564ec8107895688b0'
+md5sums=('f090a1d85273573049c93514d973e11d'
+         'af44c1849b0dcfed177bd6fae1d30413'
          'ad97e9262c7b22dd71b017a6402f612a'
          '000bd73ebc3ea46b23e2c418ef97f4c7'
          '83b5669127510100d6e7ab4094877a6e'
          '38c34ab96f6cf637f7be9f72b7400983'
-         '0f9a87db09ffd2be1fb42a1a78b9c946'
-         '8a6b25ac88a8836a68d9dc55b4d17eda')
-sha1sums=('367586cb3a8c857ad8b254589d547484018857d4'
-          'd279b6e2667d0c0e4d9fb5d7aa364baf247d9e94'
+         '4a745a2036090eb0860ed0b487505a94'
+         '8ddf6b592e6167de2df073016a9b042d')
+sha1sums=('8c31212f3cca88a9ffed505974e398b6dcfa4294'
+          '8989fcd5e0d6f25976fc2646d7542d0ed2f04f28'
           'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
           '3882901e88f4a85f85d67dcda53f83c89d4563c6'
           'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
           'b2577ac4ee93e3a611558294378c185227ed8321'
-          '7716e15d6edf5edd8c52c6e51aa6b4ce83b7dacb'
-          'c95efcaad9c6417d858575a381648a4c9a928a46')
-sha224sums=('bc8b547588626a4d1be64b8ce482b0ca85844ae6016a9eaa7f054264'
-            '1ab773e110957c39faa0c1a2f923fc2c891ed354572b2d50e438ee04'
+          '73e9ba8d4936d39ae5d36ecd9c090d9ddef723d2'
+          '1f659a83c4403c038bb33026fc69a73c4ac4d76d')
+sha224sums=('32d5df71610a7b7f4ba61dd891d9fb2911f7933441a2fc3aa196200a'
+            '77db230a65c8b75858ce6f4f52a3ae709072004ae5a0fc3d1072e415'
             '43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
             'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
             '6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
             'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
-            '6f7200cc8b17533ad09913cb87a1a609849fb8dc4430ec605b223922'
-            '1566b25eee6a99d3e6ca78497e7393c8466bf6e919681054ba14c4af')
-sha256sums=('5955c57be49f161288a9adaa4934dccd67ff50e4aa36fdbd4a65a877cd2babc6'
-            'ab7c3c46650d64ed40f6a155be20371ed484aad4615378e429875ca80e381f78'
+            '18ed3c11d4b66d82530802c73ea37f89ca1d8936e2494a658b69c000'
+            'd48db6d9e58e19bbd7715aef204c04d01953479e9d5ca7aba94b8f36')
+sha256sums=('21ede625dc061e4de3ef13f272dc9567924782b8a24d7d166859ffa38f548db3'
+            '3d533b5191154ed9d8dbcc27a286f8da6a0e6031bca0e6d6fc0987f9fe6484c0'
             'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
             'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
             'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
             'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
-            'c95e164e7a6046ad7a0481210b5be4f67c9929e63bd16dafbf5ca6e0cefeb670'
-            '379144a4e426683565c46916adb105fe1afa1e1daf98f557883feeca1aa95d43')
-sha384sums=('87e34583e5f31020ea890eefc0109d1a912540350833bb2604fc4c593473c125f5eacc9572270661ce58b9061e59b9dd'
-            '85ae632b2bb14380ab10b8c8c767d98c9b88a1bbb3711d4dc8433c4aac47af525471635166baa6600b20166628aadf41'
+            'af21b0b4de4f67888bf111cd40092599bb1425ad1a62b9b24b036f6487459646'
+            '9b5fcbcd9628d2c003d48d8e5dbbc3cb1de8dd4fa4c272cafed4f1d027e67bdb')
+sha384sums=('ce570663e4b49a50e2fc7a4c04d83f88532eedd787cef565606844bb73c16eb1d0414ddeb59ec23b578a1f592144bd82'
+            'd2bdfdbba7f0aa0e6589b43aaffd0c7b1fc5c7231767e30c4680fa9a2e5166ed94e4bdfe6e4465613f739854660ebecb'
             '762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
             '6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
             '26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
             '8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
-            'dcbb9fd7aec75c428682275067f7d721c80c570e57752ccd91932531a3260b02a18ea0d9ac60a2274aaf2960f760677f'
-            'eba6ead826268c42600ba41098bfcfaa1a13e4f7f5f8f367af6836995c41ad125ef5c5464242727b1c0f10caa3b4de37')
-sha512sums=('f3b1f08d681f73b0e9834040da3d018092c2f7c929aa91ab542ab31a56631c8e796c7a74caf119b3b52133d424b1db550f711227b7aab5bf46d76099190c5a96'
-            'e1b39277bb1c594a9a05657e0a071a3fd67157b33e37fce13368765d170e776c8f9d3a12073bb16b6057d5c62f40724339443ae21d2bf7e378b2bffcf282a26d'
+            'ba99b93a50fbf90ef0004832ea6ee9e3620b4a406b2637ccd181c4161a36aa9c67384b54a8dd6b4fefda9072a9acd027'
+            '021c3837df318b14a5b4547717b4b19436a07edf61d735ce05d2fe57f23ca2d1c9787c8b86a08f43547b6d92f935476c')
+sha512sums=('05c7b90e58d2a250ddc1be51c9194cb0631428ff698a055c8a577b165c6d7492cafeee6e7227d67c9fad5a66d1abc93ee30a528c0b4573c3e25d8bcf7a24e3f1'
+            'd0539dfd53e95bea29cb92d634dd2df259d9db8ad568c6ec368ddaeaf53e1f6b946218820bd2aa0e4726a21225e863dc55b2ddd8a0ee12fc1426fdd34feb856a'
             'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
             '16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
             '722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
             '9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b'
-            'a8ca3f025673e0662514606343ab0ef4d8d4cb560a579b6cf6516f771889b484adce44ee4a2f7014ec753c6c8dc1905925dfc03a800b342ba6fe4f800a58b3a8'
-            '584a795a05ddae117bbd777963ac38189f2e5929a1c69bd143d3acf6f02e42fb7eef8b74f989e560dcd49f8fe469984b60d6d7bbb4f82ee173e95d8a237551af')
+            '3bc8afda9d378d5a46a76a04222bef1b0136fa5a7647bc4c1c29997f89ef173ebe03677109567f5359d2d8765aada68c9b7cf5efbb19e67a8bf705b5bbda5174'
+            '7e9f198f0141cf750cb67ac0b350fb0fa2c204f5a8a271e475b2699ecf0f46cf20219cea3fd12bb5edeb8fb08159069d03afc1dd6626703e8eeddee9b365d191')
 validpgpkeys=()
 install=metals.install
 
diff --git a/metals-client.sh b/metals-client.sh
index 1d4dcf4dac3a..956f30c373f7 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -11,18 +11,19 @@ declare _CP="$_INSTALL_DIR/lib:$_INSTALL_DIR/metals"
 # installation locations of the various JDKs in Arch Linux.
 #
 # We only explicitly try known working versions, at the time of
-# writing that is >= 8 and <= 11. We prefer newer versions to older
+# writing that is >= 8 and <= 17. We prefer newer versions to older
 # ones.
-declare -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-11-openjdk/bin'
+declare -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-17-openjdk/bin'
+                                        '/usr/lib/jvm/java-16-openjdk/bin'
+                                        '/usr/lib/jvm/java-15-openjdk/bin'
+                                        '/usr/lib/jvm/java-14-openjdk/bin'
+                                        '/usr/lib/jvm/java-13-openjdk/bin'
+                                        '/usr/lib/jvm/java-12-openjdk/bin'
+                                        '/usr/lib/jvm/java-11-openjdk/bin'
                                         '/usr/lib/jvm/java-10-openjdk/bin'
                                         '/usr/lib/jvm/java-8-openjdk/jre/bin'
                                        )
-declare -r -a _DEFAULT_METALS_JAVA_OPTS=('-XX:MaxHeapFreeRatio=20' '-XX:MinHeapFreeRatio=5')
-
-# Good to have, but not supported on JDK 8 (JDK 9 is skipped because
-# it is both EOL and there is no official Arch package to install it
-# anymore.)
-declare -r -a _DEFAULT_JDK_10_PLUS_OPTS=('-XX:MaxRAMPercentage=25')
+declare -r -a _DEFAULT_METALS_JAVA_OPTS=('-XX:MaxHeapFreeRatio=20' '-XX:MinHeapFreeRatio=5' '-XX:MaxRAMPercentage=25.0')
 
 # The _actual_ metals options will be put here after
 # setup_metals_java_opts is run.
diff --git a/metals.install b/metals.install
index 9f36c8cf8b72..dbdcc128f845 100644
--- a/metals.install
+++ b/metals.install
@@ -7,15 +7,14 @@ is supported by metals and installed on your system.
 If you would like to use a different JDK set the METALS_JDK_PATH to
 the /bin directory for the JDK install.
 
-For example, if you wanted to use JDK 14 (not currently supported by
+For example, if you wanted to use JDK 18 (not currently supported by
 metals) then you would set
-METALS_JDK_PATH="/usr/lib/jvm/java-14-openjdk/bin" in the environment.
+METALS_JDK_PATH="/usr/lib/jvm/java-18-openjdk/bin" in the environment.
 
-As of 0.9.0-4 the default jvm options used to run metals have
-changed. They are now "-XX:MaxHeapFreeRatio=20 -XX:MinHeapFreeRatio=5"
-and if you are using JDK >= 10 also '-XX:MaxRAMPercentage=25'. This is
-expected to give better memory usage characteristics to a typical
-usage of metals.
+As of 0.10.6-1 the default jvm options used to run metals have
+changed. They are now "-XX:MaxHeapFreeRatio=20 -XX:MinHeapFreeRatio=5
+-XX:MaxRAMPercentage=25.0". This is expected to give better memory
+usage characteristics to a typical usage of metals.
 
 You may override these settings by settings METALS_JAVA_OPTS in the
 environment, e.g. your .bashrc/.zshrc. For example, if you wanted to
diff --git a/version-fix.patch b/version-fix.patch
index 0d694fe5c24d..1667b22a84f0 100644
--- a/version-fix.patch
+++ b/version-fix.patch
@@ -10,7 +10,7 @@ index 390a37a7f..2b41d0dd9 100644
 -      if (isCI) dynVer
 -      else localSnapshotVersion // only for local publishing
 -    },
-+    version := "0.10.5",
++    version := "0.10.6",
      // note bucket created by @tgodzik
      munitBucketName := Some("scala-metals-test-reports"),
      scalaVersion := V.scala212,
author	David Strawn	2021-09-13 10:19:39 -0600
committer	David Strawn	2021-09-13 10:19:39 -0600
commit	03495d51dbf9fc359aa9e22f8c993b3a3cdc6333 (patch)
tree	69a41c9cf10469164be9fcf80fd00a28d6dbe28a
parent	2f66d089f9a9f6313939cd1d364483717f0fd3f6 (diff)
download	aur-03495d51dbf9fc359aa9e22f8c993b3a3cdc6333.tar.gz