Move over to gradle for all building.

Use separate modules in order to build both a java as well as an android artifact, with separate and shared test cases.
signalapp · Jan 8, 2015 · c8d383b · c8d383b
1 parent 8a84af8
commit c8d383b
Show file tree

Hide file tree

Showing 155 changed files with 447 additions and 295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ target/
 obj/
 build/
 .gradle/
+local.properties
diff --git a/android/.gitignore b/android/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/build.gradle b/android/build.gradle
@@ -0,0 +1,94 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+archivesBaseName = "curve25519-android"
+version          = version_number
+group            = group_info
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
+    libraryVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                def fileName = "${archivesBaseName}-${version}.aar"
+                output.outputFile = new File(outputFile.parent, fileName)
+            }
+        }
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':java')
+
+    androidTestCompile project(":tests")
+}
+
+signing {
+    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+}
+
+uploadArchives {
+    configuration = configurations.archives
+    repositories.mavenDeployer {
+        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+        repository(url: sonatypeRepo) {
+            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
+        }
+
+        pom.project {
+            name 'curve25519-android'
+            packaging 'aar'
+            description 'Curve25519 library for Android'
+            url 'https://github.com/WhisperSystems/curve25519-java'
+
+            scm {
+                url 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                connection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                developerConnection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+            }
+
+            developers {
+                developer {
+                    name 'Trevor Perrin'
+                    name 'Moxie Marlinspike'
+                }
+            }
+        }
+    }
+}
+
+task installArchives(type: Upload) {
+    description "Installs the artifacts to the local Maven repository."
+    configuration = configurations['archives']
+    repositories {
+        mavenDeployer {
+            repository url: "file://${System.properties['user.home']}/.m2/repository"
+        }
+    }
+}
diff --git a/jni/Android.mk → android/jni/Android.mk b/jni/Android.mk → android/jni/Android.mk
diff --git a/jni/Application.mk → android/jni/Application.mk b/jni/Application.mk → android/jni/Application.mk
diff --git a/jni/curve25519-donna.c → android/jni/curve25519-donna.c b/jni/curve25519-donna.c → android/jni/curve25519-donna.c
diff --git a/jni/curve25519-donna.h → android/jni/curve25519-donna.h b/jni/curve25519-donna.h → android/jni/curve25519-donna.h
diff --git a/jni/curve25519-jni.c → android/jni/curve25519-jni.c b/jni/curve25519-jni.c → android/jni/curve25519-jni.c
diff --git a/jni/ed25519/additions/compare.c → android/jni/ed25519/additions/compare.c b/jni/ed25519/additions/compare.c → android/jni/ed25519/additions/compare.c
diff --git a/jni/ed25519/additions/compare.h → android/jni/ed25519/additions/compare.h b/jni/ed25519/additions/compare.h → android/jni/ed25519/additions/compare.h
diff --git a/jni/ed25519/additions/crypto_hash_sha512.h → ...ni/ed25519/additions/crypto_hash_sha512.h b/jni/ed25519/additions/crypto_hash_sha512.h → ...ni/ed25519/additions/crypto_hash_sha512.h
diff --git a/jni/ed25519/additions/curve_sigs.c → android/jni/ed25519/additions/curve_sigs.c b/jni/ed25519/additions/curve_sigs.c → android/jni/ed25519/additions/curve_sigs.c
diff --git a/jni/ed25519/additions/curve_sigs.h → android/jni/ed25519/additions/curve_sigs.h b/jni/ed25519/additions/curve_sigs.h → android/jni/ed25519/additions/curve_sigs.h
diff --git a/jni/ed25519/additions/sign_modified.c → ...oid/jni/ed25519/additions/sign_modified.c b/jni/ed25519/additions/sign_modified.c → ...oid/jni/ed25519/additions/sign_modified.c
diff --git a/jni/ed25519/additions/zeroize.c → android/jni/ed25519/additions/zeroize.c b/jni/ed25519/additions/zeroize.c → android/jni/ed25519/additions/zeroize.c
diff --git a/jni/ed25519/additions/zeroize.h → android/jni/ed25519/additions/zeroize.h b/jni/ed25519/additions/zeroize.h → android/jni/ed25519/additions/zeroize.h
diff --git a/jni/ed25519/api.h → android/jni/ed25519/api.h b/jni/ed25519/api.h → android/jni/ed25519/api.h
diff --git a/jni/ed25519/base.h → android/jni/ed25519/base.h b/jni/ed25519/base.h → android/jni/ed25519/base.h
diff --git a/jni/ed25519/base2.h → android/jni/ed25519/base2.h b/jni/ed25519/base2.h → android/jni/ed25519/base2.h
diff --git a/jni/ed25519/d.h → android/jni/ed25519/d.h b/jni/ed25519/d.h → android/jni/ed25519/d.h
diff --git a/jni/ed25519/d2.h → android/jni/ed25519/d2.h b/jni/ed25519/d2.h → android/jni/ed25519/d2.h
diff --git a/jni/ed25519/fe.h → android/jni/ed25519/fe.h b/jni/ed25519/fe.h → android/jni/ed25519/fe.h
diff --git a/jni/ed25519/fe_0.c → android/jni/ed25519/fe_0.c b/jni/ed25519/fe_0.c → android/jni/ed25519/fe_0.c
diff --git a/jni/ed25519/fe_1.c → android/jni/ed25519/fe_1.c b/jni/ed25519/fe_1.c → android/jni/ed25519/fe_1.c
diff --git a/jni/ed25519/fe_add.c → android/jni/ed25519/fe_add.c b/jni/ed25519/fe_add.c → android/jni/ed25519/fe_add.c
diff --git a/jni/ed25519/fe_cmov.c → android/jni/ed25519/fe_cmov.c b/jni/ed25519/fe_cmov.c → android/jni/ed25519/fe_cmov.c
diff --git a/jni/ed25519/fe_copy.c → android/jni/ed25519/fe_copy.c b/jni/ed25519/fe_copy.c → android/jni/ed25519/fe_copy.c
diff --git a/jni/ed25519/fe_frombytes.c → android/jni/ed25519/fe_frombytes.c b/jni/ed25519/fe_frombytes.c → android/jni/ed25519/fe_frombytes.c
diff --git a/jni/ed25519/fe_invert.c → android/jni/ed25519/fe_invert.c b/jni/ed25519/fe_invert.c → android/jni/ed25519/fe_invert.c
diff --git a/jni/ed25519/fe_isnegative.c → android/jni/ed25519/fe_isnegative.c b/jni/ed25519/fe_isnegative.c → android/jni/ed25519/fe_isnegative.c
diff --git a/jni/ed25519/fe_isnonzero.c → android/jni/ed25519/fe_isnonzero.c b/jni/ed25519/fe_isnonzero.c → android/jni/ed25519/fe_isnonzero.c
diff --git a/jni/ed25519/fe_mul.c → android/jni/ed25519/fe_mul.c b/jni/ed25519/fe_mul.c → android/jni/ed25519/fe_mul.c
diff --git a/jni/ed25519/fe_neg.c → android/jni/ed25519/fe_neg.c b/jni/ed25519/fe_neg.c → android/jni/ed25519/fe_neg.c
diff --git a/jni/ed25519/fe_pow22523.c → android/jni/ed25519/fe_pow22523.c b/jni/ed25519/fe_pow22523.c → android/jni/ed25519/fe_pow22523.c
diff --git a/jni/ed25519/fe_sq.c → android/jni/ed25519/fe_sq.c b/jni/ed25519/fe_sq.c → android/jni/ed25519/fe_sq.c
diff --git a/jni/ed25519/fe_sq2.c → android/jni/ed25519/fe_sq2.c b/jni/ed25519/fe_sq2.c → android/jni/ed25519/fe_sq2.c
diff --git a/jni/ed25519/fe_sub.c → android/jni/ed25519/fe_sub.c b/jni/ed25519/fe_sub.c → android/jni/ed25519/fe_sub.c
diff --git a/jni/ed25519/fe_tobytes.c → android/jni/ed25519/fe_tobytes.c b/jni/ed25519/fe_tobytes.c → android/jni/ed25519/fe_tobytes.c
diff --git a/jni/ed25519/ge.h → android/jni/ed25519/ge.h b/jni/ed25519/ge.h → android/jni/ed25519/ge.h
diff --git a/jni/ed25519/ge_add.c → android/jni/ed25519/ge_add.c b/jni/ed25519/ge_add.c → android/jni/ed25519/ge_add.c
diff --git a/jni/ed25519/ge_add.h → android/jni/ed25519/ge_add.h b/jni/ed25519/ge_add.h → android/jni/ed25519/ge_add.h
diff --git a/jni/ed25519/ge_double_scalarmult.c → android/jni/ed25519/ge_double_scalarmult.c b/jni/ed25519/ge_double_scalarmult.c → android/jni/ed25519/ge_double_scalarmult.c
diff --git a/jni/ed25519/ge_frombytes.c → android/jni/ed25519/ge_frombytes.c b/jni/ed25519/ge_frombytes.c → android/jni/ed25519/ge_frombytes.c
diff --git a/jni/ed25519/ge_madd.c → android/jni/ed25519/ge_madd.c b/jni/ed25519/ge_madd.c → android/jni/ed25519/ge_madd.c
diff --git a/jni/ed25519/ge_madd.h → android/jni/ed25519/ge_madd.h b/jni/ed25519/ge_madd.h → android/jni/ed25519/ge_madd.h
diff --git a/jni/ed25519/ge_msub.c → android/jni/ed25519/ge_msub.c b/jni/ed25519/ge_msub.c → android/jni/ed25519/ge_msub.c
diff --git a/jni/ed25519/ge_msub.h → android/jni/ed25519/ge_msub.h b/jni/ed25519/ge_msub.h → android/jni/ed25519/ge_msub.h
diff --git a/jni/ed25519/ge_p1p1_to_p2.c → android/jni/ed25519/ge_p1p1_to_p2.c b/jni/ed25519/ge_p1p1_to_p2.c → android/jni/ed25519/ge_p1p1_to_p2.c
diff --git a/jni/ed25519/ge_p1p1_to_p3.c → android/jni/ed25519/ge_p1p1_to_p3.c b/jni/ed25519/ge_p1p1_to_p3.c → android/jni/ed25519/ge_p1p1_to_p3.c
diff --git a/jni/ed25519/ge_p2_0.c → android/jni/ed25519/ge_p2_0.c b/jni/ed25519/ge_p2_0.c → android/jni/ed25519/ge_p2_0.c
diff --git a/jni/ed25519/ge_p2_dbl.c → android/jni/ed25519/ge_p2_dbl.c b/jni/ed25519/ge_p2_dbl.c → android/jni/ed25519/ge_p2_dbl.c
diff --git a/jni/ed25519/ge_p2_dbl.h → android/jni/ed25519/ge_p2_dbl.h b/jni/ed25519/ge_p2_dbl.h → android/jni/ed25519/ge_p2_dbl.h
diff --git a/jni/ed25519/ge_p3_0.c → android/jni/ed25519/ge_p3_0.c b/jni/ed25519/ge_p3_0.c → android/jni/ed25519/ge_p3_0.c
diff --git a/jni/ed25519/ge_p3_dbl.c → android/jni/ed25519/ge_p3_dbl.c b/jni/ed25519/ge_p3_dbl.c → android/jni/ed25519/ge_p3_dbl.c
diff --git a/jni/ed25519/ge_p3_to_cached.c → android/jni/ed25519/ge_p3_to_cached.c b/jni/ed25519/ge_p3_to_cached.c → android/jni/ed25519/ge_p3_to_cached.c
diff --git a/jni/ed25519/ge_p3_to_p2.c → android/jni/ed25519/ge_p3_to_p2.c b/jni/ed25519/ge_p3_to_p2.c → android/jni/ed25519/ge_p3_to_p2.c
diff --git a/jni/ed25519/ge_p3_tobytes.c → android/jni/ed25519/ge_p3_tobytes.c b/jni/ed25519/ge_p3_tobytes.c → android/jni/ed25519/ge_p3_tobytes.c
diff --git a/jni/ed25519/ge_precomp_0.c → android/jni/ed25519/ge_precomp_0.c b/jni/ed25519/ge_precomp_0.c → android/jni/ed25519/ge_precomp_0.c
diff --git a/jni/ed25519/ge_scalarmult_base.c → android/jni/ed25519/ge_scalarmult_base.c b/jni/ed25519/ge_scalarmult_base.c → android/jni/ed25519/ge_scalarmult_base.c
diff --git a/jni/ed25519/ge_sub.c → android/jni/ed25519/ge_sub.c b/jni/ed25519/ge_sub.c → android/jni/ed25519/ge_sub.c
diff --git a/jni/ed25519/ge_sub.h → android/jni/ed25519/ge_sub.h b/jni/ed25519/ge_sub.h → android/jni/ed25519/ge_sub.h
diff --git a/jni/ed25519/ge_tobytes.c → android/jni/ed25519/ge_tobytes.c b/jni/ed25519/ge_tobytes.c → android/jni/ed25519/ge_tobytes.c
diff --git a/jni/ed25519/main/main.c → android/jni/ed25519/main/main.c b/jni/ed25519/main/main.c → android/jni/ed25519/main/main.c
diff --git a/jni/ed25519/nacl_includes/crypto_int32.h → .../jni/ed25519/nacl_includes/crypto_int32.h b/jni/ed25519/nacl_includes/crypto_int32.h → .../jni/ed25519/nacl_includes/crypto_int32.h
diff --git a/jni/ed25519/nacl_includes/crypto_int64.h → .../jni/ed25519/nacl_includes/crypto_int64.h b/jni/ed25519/nacl_includes/crypto_int64.h → .../jni/ed25519/nacl_includes/crypto_int64.h
diff --git a/jni/ed25519/nacl_includes/crypto_sign.h → ...d/jni/ed25519/nacl_includes/crypto_sign.h b/jni/ed25519/nacl_includes/crypto_sign.h → ...d/jni/ed25519/nacl_includes/crypto_sign.h
diff --git a/...des/crypto_sign_edwards25519sha512batch.h → ...des/crypto_sign_edwards25519sha512batch.h b/...des/crypto_sign_edwards25519sha512batch.h → ...des/crypto_sign_edwards25519sha512batch.h
diff --git a/jni/ed25519/nacl_includes/crypto_uint32.h → ...jni/ed25519/nacl_includes/crypto_uint32.h b/jni/ed25519/nacl_includes/crypto_uint32.h → ...jni/ed25519/nacl_includes/crypto_uint32.h
diff --git a/jni/ed25519/nacl_includes/crypto_uint64.h → ...jni/ed25519/nacl_includes/crypto_uint64.h b/jni/ed25519/nacl_includes/crypto_uint64.h → ...jni/ed25519/nacl_includes/crypto_uint64.h
diff --git a/jni/ed25519/nacl_includes/crypto_verify_32.h → .../ed25519/nacl_includes/crypto_verify_32.h b/jni/ed25519/nacl_includes/crypto_verify_32.h → .../ed25519/nacl_includes/crypto_verify_32.h
diff --git a/jni/ed25519/nacl_sha512/blocks.c → android/jni/ed25519/nacl_sha512/blocks.c b/jni/ed25519/nacl_sha512/blocks.c → android/jni/ed25519/nacl_sha512/blocks.c
diff --git a/jni/ed25519/nacl_sha512/hash.c → android/jni/ed25519/nacl_sha512/hash.c b/jni/ed25519/nacl_sha512/hash.c → android/jni/ed25519/nacl_sha512/hash.c
diff --git a/jni/ed25519/open.c → android/jni/ed25519/open.c b/jni/ed25519/open.c → android/jni/ed25519/open.c
diff --git a/jni/ed25519/pow22523.h → android/jni/ed25519/pow22523.h b/jni/ed25519/pow22523.h → android/jni/ed25519/pow22523.h
diff --git a/jni/ed25519/pow225521.h → android/jni/ed25519/pow225521.h b/jni/ed25519/pow225521.h → android/jni/ed25519/pow225521.h
diff --git a/jni/ed25519/sc.h → android/jni/ed25519/sc.h b/jni/ed25519/sc.h → android/jni/ed25519/sc.h
diff --git a/jni/ed25519/sc_muladd.c → android/jni/ed25519/sc_muladd.c b/jni/ed25519/sc_muladd.c → android/jni/ed25519/sc_muladd.c
diff --git a/jni/ed25519/sc_reduce.c → android/jni/ed25519/sc_reduce.c b/jni/ed25519/sc_reduce.c → android/jni/ed25519/sc_reduce.c
diff --git a/jni/ed25519/sign.c → android/jni/ed25519/sign.c b/jni/ed25519/sign.c → android/jni/ed25519/sign.c
diff --git a/jni/ed25519/sqrtm1.h → android/jni/ed25519/sqrtm1.h b/jni/ed25519/sqrtm1.h → android/jni/ed25519/sqrtm1.h
diff --git a/libs/armeabi-v7a/libcurve25519.so → android/libs/armeabi-v7a/libcurve25519.so b/libs/armeabi-v7a/libcurve25519.so → android/libs/armeabi-v7a/libcurve25519.so
diff --git a/libs/armeabi/libcurve25519.so → android/libs/armeabi/libcurve25519.so b/libs/armeabi/libcurve25519.so → android/libs/armeabi/libcurve25519.so
diff --git a/libs/mips/libcurve25519.so → android/libs/mips/libcurve25519.so b/libs/mips/libcurve25519.so → android/libs/mips/libcurve25519.so
diff --git a/libs/x86/libcurve25519.so → android/libs/x86/libcurve25519.so b/libs/x86/libcurve25519.so → android/libs/x86/libcurve25519.so
diff --git a/...ve25519/NativeCurve25519ProviderTest.java → ...ve25519/NativeCurve25519ProviderTest.java b/...ve25519/NativeCurve25519ProviderTest.java → ...ve25519/NativeCurve25519ProviderTest.java
diff --git a/...tems/curve25519/NativeCurve25519Test.java → ...tems/curve25519/NativeCurve25519Test.java b/...tems/curve25519/NativeCurve25519Test.java → ...tems/curve25519/NativeCurve25519Test.java
@@ -1,8 +1,5 @@
 package org.whispersystems.curve25519;
 
-import static org.junit.Assert.assertTrue;
-
-
 public class NativeCurve25519Test extends Curve25519Test {
 
   @Override

diff --git a/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml
diff --git a/build.gradle b/build.gradle
@@ -1,95 +1,2 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-archivesBaseName = "curve25519-android"
-version          = "0.0.1"
-group            = "org.whispersystems"
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    androidTestCompile 'junit:junit:4.11'
-}
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.1'
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    android {
-        sourceSets {
-            main {
-                jniLibs.srcDirs = ['libs']
-            }
-            androidTest {
-                java.srcDirs = ['src/androidTest/java', 'src/commonTest/java']
-            }
-        }
-        packagingOptions {
-            exclude 'LICENSE.txt'
-        }
-    }
-
-    libraryVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                def fileName = "${archivesBaseName}-${version}.aar"
-                output.outputFile = new File(outputFile.parent, fileName)
-            }
-        }
-    }
-}
-
-signing {
-    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
-uploadArchives {
-    configuration = configurations.archives
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: sonatypeRepo) {
-            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
-        }
-
-        pom.project {
-            name 'curve25519-android'
-            packaging 'aar'
-            description 'Curve25519 library for Android'
-            url 'https://github.com/WhisperSystems/curve25519-java'
-
-            scm {
-                url 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-                connection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-                developerConnection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-            }
-
-            developers {
-                developer {
-                    name 'Trevor Perrin'
-                    name 'Moxie Marlinspike'
-                }
-            }
-        }
-    }
-}
+ext.version_number = "0.1.3"
+ext.group_info     = "org.whispersystems"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Jan 06 14:11:31 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ target/ @@
     obj/
     build/
     .gradle/
+    local.properties