Update to latest

.buckversion

@@ -1 +1 @@
-2221f806fe81b4b639d4e4b5d1eacc5ff5f9a6cc
+fe18898f1f5d53c4d3eb920ba234eb2bb859b3b0

buckw

@@ -4,7 +4,7 @@
 ##
 ##  Buck wrapper script to invoke okbuck when needed, before running buck
 ##
-##  Created by OkBuck Gradle Plugin on : Sun Dec 18 12:19:24 PST 2016
+##  Created by OkBuck Gradle Plugin on : Sun Jan 29 18:05:09 PST 2017
 ##
 #########################################################################
 
@@ -69,16 +69,15 @@ removeWatch ( ) {
 getToClean ( ) {
     ensureWatch
 
-    watchman --output-encoding=json -j 2>&1 <<-EOT
+    watchman --output-encoding=json --no-pretty -j 2>&1 <<-EOT
 ["query", "$WORKING_DIR", {
     "expression": ["allof",
         ["type", "f"],
         ["anyof",
-            ["imatch", ".buckconfig.local", "wholename"],
-            ["imatch", "**/BUCK", "wholename"]
+            ["name", ["BUCK", ".buckconfig.local"]]
         ],
         ["not",
-            ["imatch", ".okbuck/**/BUCK", "wholename"]
+            ["dirname", ".okbuck"]
         ]
     ],
     "fields": ["name"]
@@ -89,30 +88,29 @@ EOT
 getChanges ( ) {
     ensureWatch
 
-    WATCHED_CHANGES=`watchman --output-encoding=json -j 2>&1 <<-EOT
+    WATCHED_CHANGES=`watchman --output-encoding=json --no-pretty -j 2>&1 <<-EOT
 ["query", "$WORKING_DIR", {
     "since": "n:okbuck_trig",
     "expression": ["allof",
         ["type", "f"],
         ["anyof",
-            ["imatch", "**/*.gradle", "wholename"],
-            ["imatch", "**/src/**/AndroidManifest.xml", "wholename"],
-            ["imatch", "**/gradle-wrapper.properties", "wholename"],
-            ["imatch", "**/lint.xml", "wholename"]
+            ["suffix", "gradle"],
+            ["name", ["gradle-wrapper.properties", "lint.xml"]],
+            ["match", "**/src/**/AndroidManifest.xml", "wholename"]
         ]
     ],
     "fields": ["name"]
 }]
 EOT`
-    SOURCE_ROOTS=`watchman --output-encoding=json -j 2>&1 <<-EOT
+    SOURCE_ROOTS=`watchman --output-encoding=json --no-pretty -j 2>&1 <<-EOT
 ["query", ".", {
     "since": "n:okbuck_source_roots",
     "expression": ["allof",
         ["type", "d"],
         ["anyof",
-            ["imatch", "**/src/**/java", "wholename"],
-            ["imatch", "**/src/**/res", "wholename"],
-            ["imatch", "**/src/**/resources", "wholename"]
+            ["match", "**/src/**/java", "wholename"],
+            ["match", "**/src/**/res", "wholename"],
+            ["match", "**/src/**/resources", "wholename"]
         ]
     ],
     "fields": ["new", "exists", "name"]
@@ -143,7 +141,7 @@ runOkBuck ( ) {
     fi
 
     rm -f $OKBUCK_SUCCESS
-    ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true -Pandroid.enableImprovedDependenciesResolution=true $EXTRA_OKBUCK_ARGS &&
+    ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true $EXTRA_OKBUCK_ARGS &&
     updateOkBuckSuccess && success "PROCEEDING WITH BUCK" ) || die "OKBUCK FAILED"
 }
 

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
-        classpath ('com.uber:okbuck:0.13.0') {
+        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
+        classpath ('com.uber:okbuck:0.16.3') {
           exclude module: 'gradle'
         }
     }
@@ -120,11 +120,8 @@ def addCommonConfigurationForAndroidModules(Project project) {
 
 apply plugin: 'com.uber.okbuck'
 okbuck {
-    target "android-${config.build.compileSdkVersion}"
-    buildToolVersion config.build.buildToolsVersion
-    experimental {
-        parallel = true
-    }
+    target = "android-${config.build.compileSdkVersion}"
+    buildToolVersion = config.build.buildToolsVersion
 }
 
 def ENTRIES_TO_DELETE = [

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 16 11:22:44 CET 2016
+#Sun Jan 29 18:04:05 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-rc-1-bin.zip