build with system gradle

3 files changed, 15 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6e487297648..62fe5165ee95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Tue Apr  9 08:34:17 UTC 2019
 pkgbase = freenet
 	pkgdesc = An encrypted network without censorship
 	pkgver = 0.7.5.1484
@@ -7,12 +9,11 @@ pkgbase = freenet
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	checkdepends = junit
 	makedepends = java-environment>=8
 	makedepends = apache-ant
 	makedepends = git
-	makedepends = java-hamcrest
 	makedepends = zip
+	makedepends = gradle
 	depends = java-runtime>=8
 	depends = gmp
 	depends = java-service-wrapper
@@ -35,7 +36,7 @@ pkgbase = freenet
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99
-	sha256sums = 09446d86c7d26ca9f90d0b22a0d1ad3d30d861a5b87d69421a050c25c5b4d072
+	sha256sums = aa93d349c75703b2bc30d44ec18017c4e99e0b71341e6c13848210ab8e4abc68
 	sha256sums = a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769
 	sha256sums = 434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f
 	sha256sums = c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25
diff --git a/PKGBUILD b/PKGBUILD
index d6e8147a19a2..6c0c6ee632a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,8 +21,7 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 install='freenet.install'
 depends=('java-runtime>=8' 'gmp' 'java-service-wrapper')
-makedepends=('java-environment>=8' 'apache-ant' 'git' 'java-hamcrest' 'zip')
-checkdepends=('junit')
+makedepends=('java-environment>=8' 'apache-ant' 'git' 'zip' 'gradle')
 backup=('opt/freenet/wrapper.config'
         'opt/freenet/conf/freenet.ini')
 
@@ -40,7 +39,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99'
-            '09446d86c7d26ca9f90d0b22a0d1ad3d30d861a5b87d69421a050c25c5b4d072'
+            'aa93d349c75703b2bc30d44ec18017c4e99e0b71341e6c13848210ab8e4abc68'
             'a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769'
             '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f'
             'c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25'
@@ -55,12 +54,14 @@ pkgver() {
 prepare() {
     cd "fred"
 
-    # Gradle 4.10.3 - Allow building with java 10+
+    # Gradle 5.3 and Java 11 support
     export GIT_COMMITTER_NAME="aur" GIT_COMMITTER_EMAIL="aur"
-    git fetch https://github.com/Thynix/fred-staging.git gradle-5-upgrade
-    git cherry-pick 1abf6fa6^..3e75e325
+    git fetch https://github.com/skydrome/fred.git gradle-5
+    git cherry-pick f228ab0^..5a440f4
 
     ln -sf "$srcdir/gradle.properties" .
+    sed -i "$srcdir/plugin-WebOfTrust/build.xml" \
+        -e 's:value="7":value="1.8":'
     sed -i "$srcdir/plugin-UPnP/build.xml" \
         -e 's:value="1.5":value="1.8":'
     sed -i "$srcdir/plugin-KeyUtils/build.xml" \
@@ -72,10 +73,9 @@ build() {
 
     export JAVA_HOME="${JAVA_HOME:-/usr/lib/jvm/default}"
     export GRADLE_USER_HOME="$srcdir"
-    export GRADLE_OPTS="-Dfile.encoding=UTF-8"
 
     msg "Building Freenet..."
-    ./gradlew -q copyRuntimeLibs
+    gradle copyRuntimeLibs
 
     build_plugins
 }
@@ -102,7 +102,7 @@ check() {
 
     # these tests use alot of memory and can cause OOM's
     rm -f test/freenet/client/async/{*Storage,ClientRequestSelector}Test.java
-    ./gradlew test
+    gradle test
 }
 
 package() {
diff --git a/gradle.properties b/gradle.properties
index 4c63fe974b04..1076a5a5dea0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,3 @@
-project_description       = Freenet REference Daemon
-project_website_url       = https://freenetproject.org
-project_issues_url        = https://freenet.mantishub.io
-project_vcs_url           = https://github.com/freenet/fred
-
 org.gradle.daemon         = false
-org.gradle.parallel       = false
-org.gradle.jvmargs        = -Xms256m -Xmx512m
-org.gradle.configureondemand = false
-
-sourceCompatibility       = 1.8
-targetCompatibility       = 1.8
-
-tasks.withType(Test) {
-    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
-}
+org.gradle.parallel       = true
+org.gradle.jvmargs        = -Xms256m -Xmx512m
\ No newline at end of file