skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Update to latest version of gradle to support java 11

Browse Source
This commit is contained in:
Michael Ziminsky (Z) 2018-10-24 22:49:55 -07:00
parent 554c0129a2
commit e29f16a0a7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
platform-independent/c/core/build.gradle
View File

@ -43,11 +43,11 @@ library {
// Cross-compile for these host platforms. // Cross-compile for these host platforms.
// TODO: Cross-compiling, blocked by: https://github.com/gradle/gradle-native/issues/169 - CppLibraryPlugin.java:163 // TODO: Cross-compiling, blocked by: https://github.com/gradle/gradle-native/issues/169 - CppLibraryPlugin.java:163
operatingSystems.set( [objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ), operatingSystems.set( [objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS ), objects.named( OperatingSystemFamily, OperatingSystemFamily.MACOS ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.WINDOWS )] ) objects.named( OperatingSystemFamily, OperatingSystemFamily.WINDOWS )] )
components.withType( CppComponent ) { components.withType( CppComponent ) {
cppSource.from fileTree( 'src' ) cppSource.of fileTree( 'src' )
privateHeaders { privateHeaders {
// JDK for JNI support. // JDK for JNI support.
@ -88,7 +88,7 @@ static String standardOperatingSystem(NativePlatform platform) {
return OperatingSystemFamily.WINDOWS return OperatingSystemFamily.WINDOWS
else if (os.isMacOsX()) else if (os.isMacOsX())
return OperatingSystemFamily.MAC_OS return OperatingSystemFamily.MACOS
else if (os.isLinux()) else if (os.isLinux())
return OperatingSystemFamily.LINUX return OperatingSystemFamily.LINUX