v105

1 files changed, 32 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d29e542e34ae..e5d3e8228b98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Dmytro Meleshko <dmytro.meleshko@gmail.com>
 pkgbase=mindustry
 pkgname=("${pkgbase}" "${pkgbase}-server")
-_build=104.6
-pkgver="5.0_${_build}"
+_build=105
+pkgver="6.0_${_build}"
 pkgrel=1
 epoch=1
 arch=('any')
@@ -10,13 +10,13 @@ _repo_name="Mindustry"
 url="https://github.com/Anuken/${_repo_name}"
 license=('GPL3')
 depends=("java-runtime>=8" "sh" "hicolor-icon-theme")
-makedepends=("java-environment>=8" "java-environment<13" "libicns")
+makedepends=("java-environment>=8" "libicns")
 source=("${pkgbase}-${_build}.tar.gz::https://github.com/Anuken/${_repo_name}/archive/v${_build}.tar.gz"
         "${pkgbase}.desktop"
         "${pkgbase}.sh"
         "${pkgbase}-server.desktop"
         "${pkgbase}-server.sh")
-sha256sums=('c4c65ff7092554efcb598a86eecec62ccb48bc462e6405d81ec4dfe40fb116aa'
+sha256sums=('e29349ef8971930303afbbeca93efa4a920571b1adf6b9c337c11162b85d3a88'
             'e5fd49ed3456c53e91b834cb388956e3f9ded4e2c880352d36cf9c2246ca0f0b'
             '938f5f9f636379402ba0bb9a53345de499f4f3fd50f232b31605129dcf4ea6c9'
             '053030932334f40145e927f6c7e9ebf01bd28ddd1e7b9fba6234b51cc83ad241'
@@ -25,35 +25,39 @@ sha256sums=('c4c65ff7092554efcb598a86eecec62ccb48bc462e6405d81ec4dfe40fb116aa'
 build() {
   cd "${_repo_name}-${_build}"
 
-  # find JDK older than 13 because Gradle 5.x doesn't support it
-  for java_dir in /usr/lib/jvm/*; do
-    if ! [ -x "${java_dir}/bin/java" ]; then break; fi
+  # NOTE: JDK discovery code is not needed for now because the upstream switched
+  # to Gradle 6.x.  Keeping it just in case.
 
-    if [ -f "${java_dir}/release" ]; then
-      version="$(sed -n 's/^JAVA_VERSION="\(.*\)"$/\1/p' "${java_dir}/release")"
-    elif [ -f "${java_dir}/jre/lib/rt.jar" ]; then
-      version="$(unzip -p "${java_dir}/jre/lib/rt.jar" META-INF/MANIFEST.MF | sed -n 's/Implementation-Version: 1\.\(.*\)$/\1/p')"
-    else
-      break
-    fi
+  # # find JDK older than 13 because Gradle 5.x doesn't support it
+  # for java_dir in /usr/lib/jvm/*; do
+  #   if ! [ -x "${java_dir}/bin/java" ]; then break; fi
 
-    if [ -z "${version}" ]; then break; fi
+  #   if [ -f "${java_dir}/release" ]; then
+  #     version="$(sed -n 's/^JAVA_VERSION="\(.*\)"$/\1/p' "${java_dir}/release")"
+  #   elif [ -f "${java_dir}/jre/lib/rt.jar" ]; then
+  #     version="$(unzip -p "${java_dir}/jre/lib/rt.jar" META-INF/MANIFEST.MF | sed -n 's/Implementation-Version: 1\.\(.*\)$/\1/p')"
+  #   else
+  #     break
+  #   fi
 
-    if [ "$(vercmp "${version}" 8)" -ge 0 ] && [ "$(vercmp "${version}" 13)" -lt 0 ]; then
-      msg2 "Using JDK v%s from %s" "${version}" "${java_dir}"
-      msg2 "Edit the PKGBUILD if you wish to change the JDK used to compile %s" "${pkgbase}"
-      found_correct_jdk=1
-      break
-    fi
-  done; unset version
+  #   if [ -z "${version}" ]; then break; fi
 
-  if [ -z "$found_correct_jdk" ]; then
-    error "Couldn't find a JDK with version >=8 and <13"
-    return 1
-  fi
+  #   if [ "$(vercmp "${version}" 8)" -ge 0 ] && [ "$(vercmp "${version}" 13)" -lt 0 ]; then
+  #     msg2 "Using JDK v%s from %s" "${version}" "${java_dir}"
+  #     msg2 "Edit the PKGBUILD if you wish to change the JDK used to compile %s" "${pkgbase}"
+  #     found_correct_jdk=1
+  #     break
+  #   fi
+  # done; unset version
 
-  JAVA_HOME="${java_dir}" ./gradlew --no-daemon dist -Pbuildversion="${_build}"
-  unset java_dir
+  # if [ -z "$found_correct_jdk" ]; then
+  #   error "Couldn't find a JDK with version >=8 and <13"
+  #   return 1
+  # fi
+
+  # JAVA_HOME="${java_dir}" ./gradlew --no-daemon dist -Pbuildversion="${_build}"
+  ./gradlew --no-daemon dist -Pbuildversion="${_build}"
+  # unset java_dir
 
   cd core/assets/icons
   icns2png --extract icon.icns