skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Execute gradle scripts with bash.

Browse Source
This commit is contained in:
Maarten Billemont
2018-06-25 10:34:56 -04:00
parent 8276d2f4e5
commit 8ffc0ae350
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
#Fri Jun 22 01:12:28 EDT 2018
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
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

4
platform-android/build.gradle
View File

@@ -56,10 +56,10 @@ dependencies {
preBuild { preBuild {
dependsOn task( type: Exec, 'buildLibSodium', { 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', { dependsOn task( type: Exec, 'buildLibJson-c', {
commandLine "$projectDir/../lib/bin/build_libjson-c-android" commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-android"
} ) } )
} }

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

@@ -53,13 +53,11 @@ library {
if (project.tasks.findByName('buildLibSodium') == null) if (project.tasks.findByName('buildLibSodium') == null)
archive.dependsOn task( type: Exec, 'buildLibSodium', { archive.dependsOn task( type: Exec, 'buildLibSodium', {
workingDir file( "$rootDir/../lib/bin" ) commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${platform}"
commandLine 'bash', "./build_libsodium-${platform}"
} ) } )
// if (project.tasks.findByName('buildLibJson-c') == null) // if (project.tasks.findByName('buildLibJson-c') == null)
// archive.dependsOn task( type: Exec, 'buildLibJson-c', { // archive.dependsOn task( type: Exec, 'buildLibJson-c', {
// workingDir file( "$rootDir/../lib/bin" ) // commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${platform}"
// commandLine 'bash', "./build_libjson-c-${platform}"
// } ) // } )
project.dependencies { project.dependencies {