Merge pull request #4 from kageiit/update_versions

11 files changed, 65 insertions, 52 deletions

diff --git a/.buckjavaargs b/.buckjavaargs
index 84a5050..6db66a6 100644
--- a/.buckjavaargs
+++ b/.buckjavaargs
@@ -1 +1 @@
--Xms1g -Xmx8g -Xss4m
+-Xmx4g
\ No newline at end of file
diff --git a/.buckversion b/.buckversion
index 69ef86d..9f9688b 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-47da58f0be8c2b09d843fb58839c85c17db9002f
+5dfc8ae8427c89f073d69aebeffa76be13a6f0a2
diff --git a/.travis.yml b/.travis.yml
index aa483cb..473f0e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,18 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - tools
     - platform-tools
-    - android-24
-    - build-tools-24.0.2
-  licenses:
-    - android-sdk-preview-license-84831b94
-    - android-sdk-license-8933bad1
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+    - tools
+    - build-tools-25.0.1
+    - android-25
+    - extra-google-google_play_services
+    - extra-android-m2repository
+    - extra-google-m2repository  
 
 before_script:
-  - export PATH=$PATH:$HOME/.gradle/caches/okbuck/buck/bin
+  - mkdir -p $ANDROID_HOME/licenses
+  - echo $android_sdk_license > $ANDROID_HOME/licenses/android-sdk-license
+  - echo $android_sdk_preview_license > $ANDROID_HOME/licenses/android-sdk-preview-license
 
 env:
   - BUILD_COMMAND="./buildWithBuck"
diff --git a/buckw b/buckw
index fca96f8..aab336b 100755
--- a/buckw
+++ b/buckw
@@ -4,7 +4,7 @@
 ##
 ##  Buck wrapper script to invoke okbuck when needed, before running buck
 ##
-##  Created by OkBuck Gradle Plugin on : Wed Oct 12 00:38:56 PDT 2016
+##  Created by OkBuck Gradle Plugin on : Thu Dec 15 23:45:23 PST 2016
 ##
 #########################################################################
 
@@ -42,11 +42,6 @@ ensure ( ) {
     command -v $1 >/dev/null 2>&1 || die "ERROR: '$1' could be found in your PATH. Please install $1. $2"
 }
 
-md5digest ( ) {
-    # only md5 is available by default on osx, while md5sum is available on other *nix systems
-    ( ensure md5sum && md5sum $1 ) || ( ensure md5 && md5 $1 )
-}
-
 jsonq() {
     python -c "import sys,json; obj=json.load(sys.stdin); print($1)"
 }
@@ -58,6 +53,7 @@ INSTALLED_WATCHMAN=`command -v watchman`
 DEFAULT_BUCK_REPO="https://github.com/facebook/buck.git"
 DEFAULT_BUCK_INSTALL_DIR="$HOME/.gradle/caches/okbuck/buck"
 CUSTOM_BUCK_REPO=""
+CUSTOM_REMOTE_NAME="custom"
 OKBUCK_SUCCESS="$WORKING_DIR/build/okbuck.success"
 OKBUCK_DIR=".okbuck"
 MAX_DISPLAY_CHANGES=10
@@ -97,7 +93,8 @@ getChanges ( ) {
         ["anyof",
             ["imatch", "**/*.gradle", "wholename"],
             ["imatch", "**/src/**/AndroidManifest.xml", "wholename"],
-            ["imatch", "**/gradle-wrapper.properties", "wholename"]
+            ["imatch", "**/gradle-wrapper.properties", "wholename"],
+            ["imatch", "**/lint.xml", "wholename"]
         ]
     ],
     "fields": ["name"]
@@ -132,11 +129,11 @@ runOkBuck ( ) {
     if [[ ! -z "$INSTALLED_WATCHMAN" ]]; then
         getToClean | jsonq '"\n".join(obj["files"])' | xargs rm
         info "DELETED OLD BUCK FILES"
-        EXTRA_ARGS="-xokbuckClean"
+        EXTRA_OKBUCK_ARGS="-xokbuckClean $EXTRA_OKBUCK_ARGS"
     fi
 
     rm -f $OKBUCK_SUCCESS
-    ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true $EXTRA_ARGS $EXTRA_OKBUCK_ARGS --stacktrace &&
+    ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true -Pandroid.enableImprovedDependenciesResolution=true $EXTRA_OKBUCK_ARGS &&
     updateOkBuckSuccess && success "PROCEEDING WITH BUCK" ) || die "OKBUCK FAILED"
 }
 
@@ -177,11 +174,10 @@ setupBuckBinary ( ) {
 
         # Add custom buck remote
         if [[ ! -z $CUSTOM_BUCK_REPO ]]; then
-            REMOTE_NAME=$(printf '%s' $CUSTOM_BUCK_REPO | md5digest | cut -d ' ' -f 1)
             cd $BUCK_HOME
-            REMOTE_EXISTS=$(git remote -v | grep "$REMOTE_NAME")
+            REMOTE_EXISTS=$(git remote -v | grep "$CUSTOM_REMOTE_NAME")
             if [[ -z "$REMOTE_EXISTS" ]]; then
-                git remote add $REMOTE_NAME $CUSTOM_BUCK_REPO
+                git remote add $CUSTOM_REMOTE_NAME $CUSTOM_BUCK_REPO
             fi
             cd $WORKING_DIR
         fi
@@ -192,7 +188,11 @@ setupBuckBinary ( ) {
 
 # Run tasks before buck command
 setupBuckRun ( ) {
-    if [[ ! -f "$OKBUCK_SUCCESS" ]] || [[ ! -d "$OKBUCK_DIR" ]]; then
+    if [[ ! -z "$SKIP_OKBUCK" ]]; then
+        :
+    elif [[ ! -z "$FORCE_OKBUCK" ]]; then
+        runOkBuck
+    elif [[ ! -f "$OKBUCK_SUCCESS" ]] || [[ ! -d "$OKBUCK_DIR" ]]; then
         warn "NO PREVIOUS SUCCESSFUL OKBUCK RUN"
         if [[ ! -z "$INSTALLED_WATCHMAN" ]]; then
             getChanges # Prevent watchman from running after this run, since changes would already be accounted for
diff --git a/build.gradle b/build.gradle
index 9c2c371..51953d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.uber:okbuck:0.8.4'
+        classpath 'com.uber:okbuck:0.12.1'
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0'
     }
 }
@@ -119,16 +119,21 @@ def addCommonConfigurationForAndroidModules(Project project) {
 
 apply plugin: 'com.uber.okbuck'
 okbuck {
+    target "android-${config.build.compileSdkVersion}"
+    buildToolVersion config.build.buildToolsVersion
     linearAllocHardLimit = multidexApps.collectEntries { target ->
             [target, 16 * 1024 * 1024]
     }
     extraBuckOpts = multidexApps.collectEntries { target ->
-        [target, ["binary": [
+        [target, ["android_binary": [
                     "trim_resource_ids = True",
                 ]
             ]
         ]
     }
+    experimental {
+        parallel = true
+    }
 }
 
 def ENTRIES_TO_DELETE = [
@@ -144,10 +149,8 @@ def ARCHIVES = [
     '.okbuck/cache/org.mockito.mockito-core-1.10.19.jar',
     '.okbuck/cache/org.assertj.assertj-core-1.7.1.jar',
 ]
-afterEvaluate {
-    rootProject.tasks.getByName("okbuck").doLast {
-        ARCHIVES.each { archive ->
-            "zip -d ${archive} ${ENTRIES_TO_DELETE}".execute().waitFor()
-        }
+gradle.buildFinished {
+    ARCHIVES.each { archive ->
+        "zip -d ${archive} ${ENTRIES_TO_DELETE}".execute().waitFor()
     }
 }
diff --git a/buildWithBuck b/buildWithBuck
index ca20748..4b9bff6 100755
--- a/buildWithBuck
+++ b/buildWithBuck
@@ -1,4 +1,6 @@
 #!/bin/bash
 
-./buckw --version
-./buckw query "kind('android_binary', '//...')" | xargs ./buckw build
+export SKIP_OKBUCK=true
+
+SKIP_OKBUCK= ./buckw --version
+./buckw targets --type android_binary | xargs ./buckw build
diff --git a/dependencies.gradle b/dependencies.gradle
index e5aa273..0388a88 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,19 +1,19 @@
 def versions = [
-        androidToolsVersion: '25.1.0',
+        androidToolsVersion: '25.3.0-beta1',
         butterKnifeVersion : '8.4.0',
-        daggerVersion      : '2.7',
-        leakCanaryVersion  : '1.4',
-        playServicesVersion: '9.6.1',
+        daggerVersion      : '2.8',
+        leakCanaryVersion  : '1.5',
+        playServicesVersion: '10.0.1',
         roasterVersion     : '2.18.7.Final',
         stethoVersion      : '1.4.0',
-        supportVersion     : '24.2.1',
+        supportVersion     : '25.1.0',
 ]
 
 def buildConfig = [
-        compileSdkVersion: 24,
+        compileSdkVersion: 25,
         minSdkVersion    : 16,
-        targetSdkVersion : 24,
-        buildToolsVersion: '24.0.2',
+        targetSdkVersion : 25,
+        buildToolsVersion: '25.0.0',
 ]
 
 def android = [
diff --git a/gradle.properties b/gradle.properties
index 9ec54e7..fbfd6c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@ versionPatch=0
 
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xms1024m -Xmx6G
+org.gradle.jvmargs=-Xmx4G
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851..51288f9 100644
--- 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
index 2a8af7b..9430b2d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 12 00:37:35 PDT 2016
+#Thu Dec 15 23:40:23 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 27309d9..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     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=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# 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" "$@"