summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Strawn2020-01-13 14:52:54 -0700
committerGitHub2020-01-13 14:52:54 -0700
commitbdab29a70a0d7a0255878949804d361afc5841cb (patch)
tree87b3e08e8b95f26f1607c65d7f5b37c5c21b7cad
parent5f9d71b23dc0a64c2959a9f8d41335e8020d51bb (diff)
parent586b2b7b1fc4c9c7f8529d6ed4e06da873a57f5b (diff)
downloadaur-bdab29a70a0d7a0255878949804d361afc5841cb.tar.gz
Merge pull request #17 from isomarcte/0.8.0-1
Update To 0.8.0
-rw-r--r--.SRCINFO33
-rw-r--r--PKGBUILD38
-rw-r--r--version-fix.patch2
3 files changed, 36 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 69eaf8c7fb6c..048c40285c4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = metals
pkgdesc = Language Server For Scala
- pkgver = 0.7.6
- pkgrel = 2
+ pkgver = 0.8.0
+ pkgrel = 1
url = https://scalameta.org/metals/
install = metals.install
arch = any
@@ -10,62 +10,59 @@ pkgbase = metals
makedepends = sed
makedepends = grep
makedepends = coreutils
- makedepends = java-environment>=8
- makedepends = java-environment<11
- depends = java-environment>=8
depends = java-environment<=11
depends = findutils
depends = python
optdepends = bloop
- source = https://github.com/scalameta/metals/archive/v0.7.6.tar.gz
+ source = https://github.com/scalameta/metals/archive/v0.8.0.tar.gz
source = metals-client.sh
source = metals-emacs.sh
source = metals-vim.sh
source = metals-vscode.sh
source = metals-sublime.sh
source = version-fix.patch
- md5sums = db95071e1788d0e5ae6bf86e52dac4b7
+ md5sums = a431d6edf5489df6b3a6be2aefaea5ba
md5sums = 6cf70cf0eff052c61653bc21bfb38f4e
md5sums = ad97e9262c7b22dd71b017a6402f612a
md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
md5sums = 83b5669127510100d6e7ab4094877a6e
md5sums = 38c34ab96f6cf637f7be9f72b7400983
- md5sums = 1dc2df1ba655e6091e1895bcd8e1f9a9
- sha1sums = 455dbbef2517b62f2cbba63cf2e9738229ceb4de
+ md5sums = 1cdcb2c43af22c4896d9c74511254511
+ sha1sums = 699808325d5d54b857ab7bf8ec594737e8959cf5
sha1sums = d860dce31bf983fa21ab3fbca67e0dc90958acb3
sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
- sha1sums = 3a82ef7743d4c643643b39ad24fcc295ecb39988
- sha224sums = 1252a6dd399a5173bbc64062ac7eb151311817244ee35925eefe9e25
+ sha1sums = c4c4a7220fce3a2f1d72df8b7409594951c564bd
+ sha224sums = ec4aafe0fa7f6d837a4a535e2e34cdbe24b424534878e5606190ff47
sha224sums = ef780036872b5e25f64f581d8b79168d14350cb63d6d6516c2a5afcc
sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
- sha224sums = f40296b2d59f16477c4f521aefea6bcd3782c5dd6f8bcc980d29f124
- sha256sums = d5d87a0a0b7e803b1cf70f4a0350ef1da1f2ec171a93ac112bade1232ce643ab
+ sha224sums = e9401c06609ce9a1bdfa44d25c9aa30e683a4f3c9b39a737b152d1f7
+ sha256sums = 97abc9345dd695f177d2ca606660e578c8d173ce2bce3f88d0bd009aad337313
sha256sums = 6cdb3b53174f4272532f5d3a26d5564073aa38baa624d103ca79865577ab4ba0
sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
- sha256sums = 1cb95a05c4a9c62ba050941b6b879c1dde00db5e69efe72c7b1fa76e05b75f70
- sha384sums = 269da0f6f5c5eb8063cd9de87ed6580b90fee1e9626996f0a066f080abfb22a3d5c514fdd42573b9c21693a316d37c75
+ sha256sums = 4629f59e7ef3634a60d7ac84111251c4762357ede5a9731d4eec551763305a85
+ sha384sums = f60702eefd857ac4d9eb6add182a409d85e59d1149e0520e50b18d0b4e748dc9d25a1ac9561fb9af6dc5e1eb7943bb31
sha384sums = 132773ee9b7b95c8726075769652f5fc69c229548736d0a0ad9301836e9b2c78485021454bf42ca1ff642dcf1789b029
sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
- sha384sums = 20ed1c9f5d5de0466805e51e42de10a34975296e8ec0479403ad9296dfbcc4cf618ee528574f1ac22304c0c5fb5b3a84
- sha512sums = b6141d805816b7107081115a7a5418ca07a120d4cc35c9e30457655e2560a9bf938bb413c4963f85c50e9b251049b2fa1e32a67a40f2fcb1a26b1b9020a22090
+ sha384sums = 3924a0ed217a2f680d39c42bac601b563682899d1d41b46d36228ac4c8daaff1bd5f007fcecdc31de32f073fb549e49e
+ sha512sums = 003b873dc96c4cd382209bb339a89bb051fe2a33c76ff1729be54b8f21c9a76acd29525e65863a70743cf7cb0adf3e1e1b988eb79d97062cfa0ab9b7515e5c45
sha512sums = 8528f1eddf680f1569106395b9fce97c07dd12f3f3f64683b9c02c79e74da0ec4a9f4c5cd2031e11d98c03deb01011394333795bf448148c5b9ae199af041539
sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
sha512sums = 9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b
- sha512sums = c2d0773b135b1f271de9af160edb52046ad4ed5e81223c7cc6caa98360b69999727ac564f358bdafa90ab32f4b7764279fcdd4c2ee420dfca4569c3ba864086b
+ sha512sums = d135f4629a8a787e3bf1476b3166ea6a5908a7561d25b84749cd61518830b0d6e0bb1237b0e4ac01cdd92f1861779f2763d4b265f999afb4a4c3ff7711932c7a
pkgname = metals
diff --git a/PKGBUILD b/PKGBUILD
index 0e7949f4de03..f570777fef51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,16 +5,16 @@
# Maintainer: David Strawn <isomarcte a__t gmail d__o__t c__o__m>
pkgname='metals'
-pkgver='0.7.6'
-pkgrel=2
+pkgver='0.8.0'
+pkgrel=1
epoch=
pkgdesc='Language Server For Scala'
url='https://scalameta.org/metals/'
arch=(any)
license=('Apache')
groups=()
-depends=('java-environment>=8' 'java-environment<=11' 'findutils' 'python')
-makedepends=('sbt' 'sed' 'grep' 'coreutils' 'java-environment>=8' 'java-environment<11')
+depends=('java-environment<=11' 'findutils' 'python')
+makedepends=('sbt' 'sed' 'grep' 'coreutils')
checkdepends=()
optdepends=('bloop')
provides=()
@@ -26,48 +26,48 @@ 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')
noextract=()
-md5sums=('db95071e1788d0e5ae6bf86e52dac4b7'
+md5sums=('a431d6edf5489df6b3a6be2aefaea5ba'
'6cf70cf0eff052c61653bc21bfb38f4e'
'ad97e9262c7b22dd71b017a6402f612a'
'000bd73ebc3ea46b23e2c418ef97f4c7'
'83b5669127510100d6e7ab4094877a6e'
'38c34ab96f6cf637f7be9f72b7400983'
- '1dc2df1ba655e6091e1895bcd8e1f9a9')
-sha1sums=('455dbbef2517b62f2cbba63cf2e9738229ceb4de'
+ '1cdcb2c43af22c4896d9c74511254511')
+sha1sums=('699808325d5d54b857ab7bf8ec594737e8959cf5'
'd860dce31bf983fa21ab3fbca67e0dc90958acb3'
'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
'3882901e88f4a85f85d67dcda53f83c89d4563c6'
'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
'b2577ac4ee93e3a611558294378c185227ed8321'
- '3a82ef7743d4c643643b39ad24fcc295ecb39988')
-sha224sums=('1252a6dd399a5173bbc64062ac7eb151311817244ee35925eefe9e25'
+ 'c4c4a7220fce3a2f1d72df8b7409594951c564bd')
+sha224sums=('ec4aafe0fa7f6d837a4a535e2e34cdbe24b424534878e5606190ff47'
'ef780036872b5e25f64f581d8b79168d14350cb63d6d6516c2a5afcc'
'43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
'6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
- 'f40296b2d59f16477c4f521aefea6bcd3782c5dd6f8bcc980d29f124')
-sha256sums=('d5d87a0a0b7e803b1cf70f4a0350ef1da1f2ec171a93ac112bade1232ce643ab'
+ 'e9401c06609ce9a1bdfa44d25c9aa30e683a4f3c9b39a737b152d1f7')
+sha256sums=('97abc9345dd695f177d2ca606660e578c8d173ce2bce3f88d0bd009aad337313'
'6cdb3b53174f4272532f5d3a26d5564073aa38baa624d103ca79865577ab4ba0'
'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
- '1cb95a05c4a9c62ba050941b6b879c1dde00db5e69efe72c7b1fa76e05b75f70')
-sha384sums=('269da0f6f5c5eb8063cd9de87ed6580b90fee1e9626996f0a066f080abfb22a3d5c514fdd42573b9c21693a316d37c75'
+ '4629f59e7ef3634a60d7ac84111251c4762357ede5a9731d4eec551763305a85')
+sha384sums=('f60702eefd857ac4d9eb6add182a409d85e59d1149e0520e50b18d0b4e748dc9d25a1ac9561fb9af6dc5e1eb7943bb31'
'132773ee9b7b95c8726075769652f5fc69c229548736d0a0ad9301836e9b2c78485021454bf42ca1ff642dcf1789b029'
'762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
'6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
'26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
'8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
- '20ed1c9f5d5de0466805e51e42de10a34975296e8ec0479403ad9296dfbcc4cf618ee528574f1ac22304c0c5fb5b3a84')
-sha512sums=('b6141d805816b7107081115a7a5418ca07a120d4cc35c9e30457655e2560a9bf938bb413c4963f85c50e9b251049b2fa1e32a67a40f2fcb1a26b1b9020a22090'
+ '3924a0ed217a2f680d39c42bac601b563682899d1d41b46d36228ac4c8daaff1bd5f007fcecdc31de32f073fb549e49e')
+sha512sums=('003b873dc96c4cd382209bb339a89bb051fe2a33c76ff1729be54b8f21c9a76acd29525e65863a70743cf7cb0adf3e1e1b988eb79d97062cfa0ab9b7515e5c45'
'8528f1eddf680f1569106395b9fce97c07dd12f3f3f64683b9c02c79e74da0ec4a9f4c5cd2031e11d98c03deb01011394333795bf448148c5b9ae199af041539'
'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
'16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
'722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
'9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b'
- 'c2d0773b135b1f271de9af160edb52046ad4ed5e81223c7cc6caa98360b69999727ac564f358bdafa90ab32f4b7764279fcdd4c2ee420dfca4569c3ba864086b')
+ 'd135f4629a8a787e3bf1476b3166ea6a5908a7561d25b84749cd61518830b0d6e0bb1237b0e4ac01cdd92f1861779f2763d4b265f999afb4a4c3ff7711932c7a')
validpgpkeys=()
install=metals.install
@@ -88,7 +88,8 @@ build() {
local -r _ORG_PATH="$PATH"
local -r _SBT_DIR="./.sbt"
local -r _SBT_IVY="./.ivy2"
- local -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-10-openjdk/bin'
+ local -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-11-openjdk/bin'
+ '/usr/lib/jvm/java-10-openjdk/bin'
'/usr/lib/jvm/java-8-openjdk/jre/bin'
)
local -r _LEN="${#_JAVA_ARCH_PACKAGE_PATHS[@]}"
@@ -151,7 +152,8 @@ package() {
local -r _TEMP_FILE="$(mktemp)"
local -r _LAUNCHER_SCRIPTS=('metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh')
local -r _ORG_PATH="$PATH"
- local -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-10-openjdk/bin'
+ local -r -a _JAVA_ARCH_PACKAGE_PATHS=('/usr/lib/jvm/java-11-openjdk/bin'
+ '/usr/lib/jvm/java-10-openjdk/bin'
'/usr/lib/jvm/java-8-openjdk/jre/bin'
)
diff --git a/version-fix.patch b/version-fix.patch
index e5a0cae78b3e..a9505cdc17d8 100644
--- a/version-fix.patch
+++ b/version-fix.patch
@@ -10,7 +10,7 @@ index e73ff967..d3e13746 100644
- if (isCI) dynVer
- else localSnapshotVersion // only for local publishng
- },
-+ version := "0.7.6",
++ version := "0.8.0",
scalaVersion := V.scala212,
crossScalaVersions := List(V.scala212),
scalacOptions ++= List(