2
0

Support for building with JDK 10.

This commit is contained in:
Maarten Billemont
2018-07-26 15:05:58 -04:00
parent 513840e2c4
commit 7c83a62f91
6 changed files with 11 additions and 13 deletions

View File

@@ -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 )
}
}

View File

@@ -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
}