Tool version updates, corrected properties for JavaDoc and keystore (#147)

Author: iainmcgin

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
         classpath 'org.ajoberstar:gradle-git:1.5.1'
@@ -34,9 +34,9 @@ if (project.ext.versionName == null) {
 }
 
 project.ext.minSdkVersion = 15
-project.ext.compileSdkVersion = 24
-project.ext.buildToolsVersion = '24.0.2'
-project.ext.supportLibVersion = '24.2.1'
+project.ext.compileSdkVersion = 25
+project.ext.buildToolsVersion = '25.0.1'
+project.ext.supportLibVersion = '25.1.0'
 
 task showVersion << {
     logger.lifecycle("Version ID: " + project.versionNum)

config/javadoc.gradle

@@ -1,6 +1,6 @@
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
-    title = "OpenYOLO"
+    title = "AppAuth Android"
     classpath = files(project.android.getBootClasspath())
     options {
         links "http://docs.oracle.com/javase/7/docs/api/"

config/keystore.gradle

@@ -5,24 +5,24 @@ def generateKeystore = { keystoreFile ->
         executable "keytool"
         args [
                 "-genkey",
-                "-keystore", "openyolo.keystore",
-                "-alias", "openyolo",
+                "-keystore", "appauth.keystore",
+                "-alias", "appauth",
                 "-keyalg", "RSA",
                 "-keysize", "2048",
                 "-validity", "10000",
-                "-keypass", "openyolo",
-                "-storepass", "openyolo",
-                "-dname", "CN=openyolo"
+                "-keypass", "appauth",
+                "-storepass", "appauth",
+                "-dname", "CN=appauth"
                 ]
     }
 }
 
 // checks that a keystore exists in the expected location, and generates one
 // if it does not.
 ext.verifyKeystore = {
-    def keystoreFile = file(new File(projectDir, "openyolo.keystore"))
+    def keystoreFile = file(new File(projectDir, "appauth.keystore"))
     if (!keystoreFile.exists()) {
-        logger.lifecycle("openyolo.keystore missing - creating one")
+        logger.lifecycle("appauth.keystore missing - creating one")
         generateKeystore(keystoreFile)
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Sep 21 14:00:12 PDT 2016
+#Wed Jan 18 10:13:16 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line