Update to latest version of gradle to support java 11
This commit is contained in:
parent
554c0129a2
commit
e29f16a0a7
BIN
gradle/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
@ -43,11 +43,11 @@ library {
|
||||
// Cross-compile for these host platforms.
|
||||
// TODO: Cross-compiling, blocked by: https://github.com/gradle/gradle-native/issues/169 - CppLibraryPlugin.java:163
|
||||
operatingSystems.set( [objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
|
||||
objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS ),
|
||||
objects.named( OperatingSystemFamily, OperatingSystemFamily.MACOS ),
|
||||
objects.named( OperatingSystemFamily, OperatingSystemFamily.WINDOWS )] )
|
||||
|
||||
components.withType( CppComponent ) {
|
||||
cppSource.from fileTree( 'src' )
|
||||
cppSource.of fileTree( 'src' )
|
||||
|
||||
privateHeaders {
|
||||
// JDK for JNI support.
|
||||
@ -88,7 +88,7 @@ static String standardOperatingSystem(NativePlatform platform) {
|
||||
return OperatingSystemFamily.WINDOWS
|
||||
|
||||
else if (os.isMacOsX())
|
||||
return OperatingSystemFamily.MAC_OS
|
||||
return OperatingSystemFamily.MACOS
|
||||
|
||||
else if (os.isLinux())
|
||||
return OperatingSystemFamily.LINUX
|
||||
|
Loading…
Reference in New Issue
Block a user