From 7c83a62f91f7fa2d74f0bf6459f701672f87ec69 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Thu, 26 Jul 2018 15:05:58 -0400
Subject: [PATCH] Support for building with JDK 10.

---
 gradle/gradle.properties                        |  1 +
 lib/bin/build_lib                               |  1 +
 ..._lyndir_masterpassword_impl_MPAlgorithmV0.h} |  0
 platform-independent/c/core/src/mpw-jni.c       |  3 ++-
 .../java/algorithm/build.gradle                 | 17 ++++++-----------
 platform-independent/java/gui/build.gradle      |  2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 rename platform-independent/c/core/src/{mpw-jni.h => java/com_lyndir_masterpassword_impl_MPAlgorithmV0.h} (100%)

diff --git a/gradle/gradle.properties b/gradle/gradle.properties
index 9a4bf543..ed240cf5 100644
--- a/gradle/gradle.properties
+++ b/gradle/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx1536M
+android.enableD8.desugaring=true
diff --git a/lib/bin/build_lib b/lib/bin/build_lib
index 6bc493d6..319cd68c 100755
--- a/lib/bin/build_lib
+++ b/lib/bin/build_lib
@@ -24,6 +24,7 @@
 # target_prepare() { make -s distclean; }
 # target_configure() { _target_configure "$@" --enable-minimal; }
 set -e
+PATH+=:/usr/local/bin
 
 # needs <binary> ...
 #
diff --git a/platform-independent/c/core/src/mpw-jni.h b/platform-independent/c/core/src/java/com_lyndir_masterpassword_impl_MPAlgorithmV0.h
similarity index 100%
rename from platform-independent/c/core/src/mpw-jni.h
rename to platform-independent/c/core/src/java/com_lyndir_masterpassword_impl_MPAlgorithmV0.h
diff --git a/platform-independent/c/core/src/mpw-jni.c b/platform-independent/c/core/src/mpw-jni.c
index a6ae656b..a927cdd0 100644
--- a/platform-independent/c/core/src/mpw-jni.c
+++ b/platform-independent/c/core/src/mpw-jni.c
@@ -1,6 +1,7 @@
 #include <string.h>
 
-#include "mpw-jni.h"
+#include "java/com_lyndir_masterpassword_impl_MPAlgorithmV0.h"
+
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
diff --git a/platform-independent/java/algorithm/build.gradle b/platform-independent/java/algorithm/build.gradle
index 2d61df49..645e689c 100644
--- a/platform-independent/java/algorithm/build.gradle
+++ b/platform-independent/java/algorithm/build.gradle
@@ -4,6 +4,11 @@ plugins {
 
 description = 'Master Password Algorithm Implementation'
 
+tasks.withType( JavaCompile ) {
+    // Native headers
+    options.compilerArgs += ["-h", new File( new File( project( ':masterpassword-core' ).projectDir, 'src' ), 'java' ).absolutePath]
+}
+
 configurations {
     lib
 }
@@ -24,17 +29,7 @@ processResources {
         into new File( processResources.outputs.files.singleFile, "lib" )
 
         dependsOn configurations.lib {
-            files.each { libFile ->
-                from( zipTree( libFile ) )
-            }
+            files.each { libFile -> from( zipTree( libFile ) ) }
         }
     } )
 }
-
-compileJava {
-    doLast {
-        ant.javah( class: 'com.lyndir.masterpassword.impl.MPAlgorithmV0',
-                   outputFile: new File( project( ':masterpassword-core' ).projectDir, 'src/mpw-jni.h' ),
-                   classpath: files( sourceSets.main.compileClasspath, sourceSets.main.output ).asPath )
-    }
-}
diff --git a/platform-independent/java/gui/build.gradle b/platform-independent/java/gui/build.gradle
index 95f59e5d..7cd5ad3a 100644
--- a/platform-independent/java/gui/build.gradle
+++ b/platform-independent/java/gui/build.gradle
@@ -36,5 +36,5 @@ shadowJar {
 
 run {
     // I don't fully understand why this is necessary, but without it -Dmp.log.level is lost.
-    systemProperties = System.properties
+    //systemProperties = System.properties
 }