[arch-commits] Commit in gradle/trunk (PKGBUILD gradle.sh)

[Levente Polyak]

    Date: Wednesday, October 9, 2019 @ 16:43:25
  Author: anthraxx
Revision: 514368

upgpkg: gradle 5.6.2-3 hard wire to java 11 (13 is incompatible) [fixup]

Currently java 13 is incompatible and 12 is EOL, therefor lets hard wire
gradle runtime to java11 until gradle 6 is released.

https://github.com/gradle/gradle/issues/8681

gradle can use other (older) environments if specified accordingly via
its options.

Previous commit didn't take intermediate/generated scripts into account.

Modified:
  gradle/trunk/PKGBUILD
  gradle/trunk/gradle.sh

-----------+
 PKGBUILD  |   10 ++++++----
 gradle.sh |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-09 15:39:30 UTC (rev 514367)
+++ PKGBUILD	2019-10-09 16:43:25 UTC (rev 514368)
@@ -6,7 +6,7 @@
 pkgbase=gradle
 pkgname=('gradle' 'gradle-doc' 'gradle-src')
 pkgver=5.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Powerful build system for the JVM'
 url='https://gradle.org/'
 arch=('any')
@@ -16,14 +16,14 @@
 source=(https://services.gradle.org/distributions/${pkgbase}-${pkgver}-src.zip
         ${pkgbase}.sh)
 sha256sums=('bc03088fc7ecb43181b48367bd7589684340f9ae4ffd108fa717e49f4b0d3544'
-            '7cdd70370b92b297f350d5ff69b915359bdc37b4feac839696b0ab5eaa7d7c2a')
+            '6f3472486278252417af49196847ba465b56819d286658fcdf918687f89ee032')
 sha512sums=('ad91ce5153c39bd21aaee2011b412358c4196a8106f7d83262b065bad650a15e7a5105d47fc5a21e400fbb366cd5259a60761779f0e76ec94e7401021a6f747b'
-            'f38e9b26e22948366acf6580d6f38e2c88c3791c425b24922368fe1bc78c744fa516a03ffdbef02e3755859da620a6259997d4b4e5f97e3dc8cb49b74a694616')
+            'a50b6cf8281b56b80f55a20ac9316e1eed6887da1d191ad575dec140c9819711644d7077c4dc693b8cb0f1b08ceba0033ba88b5ad138d33ffb73b786c0d4bf81')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   # https://github.com/gradle/gradle/issues/8681
-  sed 's|JAVACMD="java"|JAVACMD="/usr/lib/jvm/java-11-openjdk/bin/java"|' -i gradlew \
+  sed 's|JAVACMD="java"|JAVACMD="/usr/lib/jvm/java-11-openjdk/bin/java"|g' -i gradlew \
     subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 }
 
@@ -31,6 +31,8 @@
   cd ${pkgbase}-${pkgver}
   export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"
   ./gradlew installAll -PfinalRelease=true -Pgradle_installPath="$(pwd)/dist"
+  # https://github.com/gradle/gradle/issues/8681
+  sed 's|JAVACMD="java"|JAVACMD="/usr/lib/jvm/java-11-openjdk/bin/java"|g' -i dist/bin/gradle
 }
 
 package_gradle() {

Modified: gradle.sh
===================================================================
--- gradle.sh	2019-10-09 15:39:30 UTC (rev 514367)
+++ gradle.sh	2019-10-09 16:43:25 UTC (rev 514368)
@@ -1,2 +1,2 @@
-#!/usr/bin/env sh                                          
-export GRADLE_HOME=/usr/share/java/gradle                  
+#!/bin/sh
+export GRADLE_HOME=/usr/share/java/gradle