diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar index 91ca28c8..29953ea1 100644 Binary files a/gradle/gradle/wrapper/gradle-wrapper.jar and b/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties index 16d28051..e0b3fb8d 100644 --- a/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle index 54fc8478..797d6469 100644 --- a/platform-independent/c/core/build.gradle +++ b/platform-independent/c/core/build.gradle @@ -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