summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGautam Korlam <gkorlam@uber.com>2016-09-29 01:55:44 -0400
committerGautam Korlam <gkorlam@uber.com>2016-09-29 01:55:44 -0400
commit8409b4d9765a90c11c7a4165dbcd3e5e8692b5c4 (patch)
tree4d43d4f2198fede32b10d7cd23dd73501e98f6ad
parent3a38353855e1ae35c4c408156f56dfb705f65b38 (diff)
downloadandroid-studio-gradle-test-8409b4d9765a90c11c7a4165dbcd3e5e8692b5c4.tar.gz
Update to okbuck 0.7.0
-rw-r--r--.buckversion2
-rwxr-xr-xbuckw6
-rw-r--r--build.gradle6
3 files changed, 7 insertions, 7 deletions
diff --git a/.buckversion b/.buckversion
index 9a5e5f9..df4b7d1 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-ca49d538d93491020b28b44b6969b25b25e9ccdb
+03d4f99418a6ce58de8a96aa55400068e7eb54dc
diff --git a/buckw b/buckw
index ac95dff..0e7204f 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 : Mon Sep 26 13:12:41 PDT 2016
+## Created by OkBuck Gradle Plugin on : Thu Sep 29 01:42:38 EDT 2016
##
#########################################################################
@@ -56,7 +56,7 @@ ensure ant 'http://ant.apache.org/'
INSTALLED_WATCHMAN=`command -v watchman`
DEFAULT_BUCK_REPO="https://github.com/facebook/buck.git"
-DEFAULT_BUCK_INSTALL_DIR="$HOME/.gradle/caches/okbuilds/buck"
+DEFAULT_BUCK_INSTALL_DIR="$HOME/.gradle/caches/okbuck/buck"
CUSTOM_BUCK_REPO=""
OKBUCK_SUCCESS="$WORKING_DIR/build/okbuck.success"
OKBUCK_DIR=".okbuck"
@@ -132,7 +132,7 @@ runOkBuck ( ) {
fi
rm -f $OKBUCK_SUCCESS
- ( $WORKING_DIR/gradlew -p $WORKING_DIR :okbuck -Dokbuck.wrapper=true $EXTRA_ARGS --stacktrace && updateOkBuckSuccess && success "PROCEEDING WITH BUCK" ) || die "OKBUCK FAILED"
+ ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true $EXTRA_ARGS --stacktrace && updateOkBuckSuccess && success "PROCEEDING WITH BUCK" ) || die "OKBUCK FAILED"
}
watchmanWorkflow ( ) {
diff --git a/build.gradle b/build.gradle
index fbf5ac3..fe6ac35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,10 +9,12 @@ buildscript {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.6'
- classpath 'com.github.okbuilds:okbuild-gradle-plugin:0.6.0'
+ classpath 'com.uber:okbuck:0.7.0'
}
}
+apply plugin: 'com.uber.okbuck'
+
allprojects {
project -> project.apply from: rootProject.file('dependencies.gradle')
repositories { jcenter() }
@@ -87,5 +89,3 @@ def addCommonConfigurationForAndroidModules(Project project) {
}
}
}
-
-apply plugin: 'com.github.okbuilds.okbuck-gradle-plugin'