Update To Force Building With JDK 8

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e689e99fa17..c98d629ff657 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = scala
 	pkgdesc = A Java-interoperable language with object-oriented and functional features
 	pkgver = 2.13.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.scala-lang.org
 	arch = any
 	license = Apache
 	makedepends = git
 	makedepends = sbt
+	makedepends = jdk8-openjdk
 	source = scala-2.13.10.tar.gz::https://github.com/scala/scala/archive/v2.13.10.tar.gz
 	source = scala-docs-2.13.10.tar.xz::https://www.scala-lang.org/files/archive/scala-docs-2.13.10.txz
 	sha512sums = 7a89ee746d892640faf0ad3a91715c91bd174acbae22fde7dcbc16a71c6bd84d4f448071fd497a778ef5aaba48c306150e591ad1d2c263764aeac79bcc021529
 	sha512sums = 0ccbae59327b7a2254115d729f08c75e80c3d0f07a4ebd0f7947307b1cbd4a77a9581a8baa6bba0f98472485b441e5daaf153b9c78c0613c7886e9dc3e8650b3
 
 pkgname = scala
-	depends = java-runtime>=8
+	depends = java-environment
 	optdepends = scala-docs
 	optdepends = scala-sources
 	optdepends = graphviz: generate diagrams
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..93e684daf413
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/PKGBUILD-namcap.log
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 1ecc9ae4e356..227282238660 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Maintainer: David Strawn <isomarcte at gmail dot com>
 # Contributor: Evgeniy Alekseev <arcanis at archlinux dot org>
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail dot com>
@@ -8,7 +10,7 @@ pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
 pkgver=2.13.10
 # shellcheck disable=SC2034
-pkgrel=1
+pkgrel=2
 pkgdesc='A Java-interoperable language with object-oriented and functional features'
 # shellcheck disable=SC2034
 arch=('any')
@@ -17,7 +19,7 @@ url='https://www.scala-lang.org'
 # shellcheck disable=SC2034
 license=('Apache')
 # shellcheck disable=SC2034
-makedepends=('git' 'sbt')
+makedepends=('git' 'sbt' 'jdk8-openjdk')
 # shellcheck disable=SC2034
 source=("scala-${pkgver}.tar.gz::https://github.com/scala/scala/archive/v${pkgver}.tar.gz"
         "scala-docs-${pkgver}.tar.xz::https://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz")
@@ -31,11 +33,26 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}" || exit 1
+
+  ORIGINAL_PATH="${PATH:?}"
+  JDK8_BIN_PATH='/usr/lib/jvm/java-8-openjdk/bin'
+
+  if [ -d "${JDK8_BIN_PATH:?}" ]
+  then
+      # Force compilation with jdk8. This is because if it compiles
+      # with a jdk > 8, Scala's type inference on certain calls to
+      # java.nio classes can infer a more specific method type which
+      # doesn't exist in jdk 8.
+      export PATH="${JDK8_BIN_PATH:?}:${PATH:?}"
+  fi
+
   sbt dist/mkPack packageSrc packageDoc
+
+  PATH="${ORIGINAL_PATH:?}"
 }
 
 package_scala() {
-  depends=('java-runtime>=8')
+  depends=('java-environment')
   optdepends=('scala-docs'
               'scala-sources'
               'graphviz: generate diagrams')