diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties index 49df2ab4..16d28051 100644 --- a/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 22 01:12:28 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/platform-android/build.gradle b/platform-android/build.gradle index ed491ee3..819d8af0 100644 --- a/platform-android/build.gradle +++ b/platform-android/build.gradle @@ -56,10 +56,10 @@ dependencies { preBuild { dependsOn task( type: Exec, 'buildLibSodium', { - commandLine "$projectDir/../lib/bin/build_libsodium-android" + commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-android" } ) dependsOn task( type: Exec, 'buildLibJson-c', { - commandLine "$projectDir/../lib/bin/build_libjson-c-android" + commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-android" } ) } diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle index 4de67c83..9172673f 100644 --- a/platform-independent/c/core/build.gradle +++ b/platform-independent/c/core/build.gradle @@ -53,13 +53,11 @@ library { if (project.tasks.findByName('buildLibSodium') == null) archive.dependsOn task( type: Exec, 'buildLibSodium', { - workingDir file( "$rootDir/../lib/bin" ) - commandLine 'bash', "./build_libsodium-${platform}" + commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${platform}" } ) // if (project.tasks.findByName('buildLibJson-c') == null) // archive.dependsOn task( type: Exec, 'buildLibJson-c', { -// workingDir file( "$rootDir/../lib/bin" ) -// commandLine 'bash', "./build_libjson-c-${platform}" +// commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${platform}" // } ) project.dependencies {