diff options
| author | Gautam Korlam <gkorlam@uber.com> | 2017-03-29 08:28:56 -0700 |
|---|---|---|
| committer | Gautam Korlam <gkorlam@uber.com> | 2017-03-29 08:28:56 -0700 |
| commit | f253c8601c64acf7bf13c72359de578e3e92c95c (patch) | |
| tree | 5e80afc71ab85d7879c37864280e58e3ea17d2a0 | |
| parent | 08f352c217031c41498bd7dd50b58089364ed582 (diff) | |
| download | android-studio-gradle-test-f253c8601c64acf7bf13c72359de578e3e92c95c.tar.gz | |
Update gradle,buck and android gradle plugin to latest
| -rw-r--r-- | .buckversion | 2 | ||||
| -rwxr-xr-x | buckw | 37 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 54213 -> 54788 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
6 files changed, 6 insertions, 42 deletions
diff --git a/.buckversion b/.buckversion index eb0a876..5b273f7 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -fe18898f1f5d53c4d3eb920ba234eb2bb859b3b0 +942cdc60ffa6f2bcc12a780da905cb963f661423 @@ -4,7 +4,7 @@ ## ## Buck wrapper script to invoke okbuck when needed, before running buck ## -## Created by OkBuck Gradle Plugin on : Sun Jan 29 18:05:09 PST 2017 +## Created by OkBuck Gradle Plugin on : Wed Mar 29 08:26:32 PDT 2017 ## ######################################################################### @@ -62,29 +62,6 @@ ensureWatch ( ) { watchman watch-project $WORKING_DIR >/dev/null 2>&1 } -removeWatch ( ) { - watchman watch-del $WORKING_DIR >/dev/null 2>&1 -} - -getToClean ( ) { - ensureWatch - - watchman --output-encoding=json --no-pretty -j 2>&1 <<-EOT -["query", "$WORKING_DIR", { - "expression": ["allof", - ["type", "f"], - ["anyof", - ["name", ["BUCK", ".buckconfig.local"]] - ], - ["not", - ["dirname", ".okbuck"] - ] - ], - "fields": ["name"] -}] -EOT -} - getChanges ( ) { ensureWatch @@ -128,18 +105,6 @@ runOkBuck ( ) { info "RUNNING OKBUCK..." echo - if [[ ! -z "$INSTALLED_WATCHMAN" ]]; then - TO_CLEAN=$(getToClean | jsonq '"\n".join(obj["files"])') - if [[ $? -eq 0 ]]; then - echo $TO_CLEAN | xargs rm - info "DELETED OLD BUCK FILES" - EXTRA_OKBUCK_ARGS="-xokbuckClean $EXTRA_OKBUCK_ARGS" - else - warn "WATCHMAN FAILED. USING OKBUCKCLEAN." - removeWatch - fi - fi - rm -f $OKBUCK_SUCCESS ( $WORKING_DIR/gradlew -p $WORKING_DIR okbuck -Dokbuck.wrapper=true $EXTRA_OKBUCK_ARGS && updateOkBuckSuccess && success "PROCEEDING WITH BUCK" ) || die "OKBUCK FAILED" diff --git a/build.gradle b/build.gradle index b0b9649..7428b23 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0-beta3' - classpath ('com.uber:okbuck:0.16.3') { + classpath 'com.android.tools.build:gradle:2.4.0-alpha3' + classpath ('com.uber:okbuck:0.19.6') { exclude module: 'gradle' } } diff --git a/gradle.properties b/gradle.properties index 67ab26a..fbfd6c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,4 @@ versionPatch=0 org.gradle.daemon=true org.gradle.parallel=true -org.gradle.workers.max=16 org.gradle.jvmargs=-Xmx4G diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 9a0baa5..748275f 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 1267578..0947aff 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jan 29 18:04:05 PST 2017 +#Wed Mar 29 08:28:19 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-bin.zip |