update build tools and gradle
Updates CI config to use auto downloading artifacts.
ADD
.buildscript/licenses/android-sdk-license
+8933bad161af4178b1185d1a37fbf41ea5269c55
\ No newline at end of file

DELETE
.buildscript/setup.sh
-#!/bin/bash
-
-set -ex
-
-export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH"
-
-DEPS="$ANDROID_HOME/installed-dependencies"
-
-if [ ! -e $DEPS ]; then
- cp -r /usr/local/android-sdk-linux $ANDROID_HOME &&
- echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support,extra-android-m2repository &&
- touch $DEPS
-fi

MODIFY
analytics-samples/analytics-sample/build.gradle
analytics-samples/analytics-sample/build.gradle
apply plugin: 'com.android.application'
apply plugin: 'com.f2prateek.javafmt'
+
apply from: rootProject.file('gradle/android.gradle')
dependencies {

MODIFY
analytics-samples/analytics-wear-sample/build.gradle
analytics-samples/analytics-wear-sample/build.gradle
apply plugin: 'com.android.application'
apply plugin: 'com.f2prateek.javafmt'
+
apply from: rootProject.file('gradle/android.gradle')
android {

MODIFY
analytics-tests/build.gradle
analytics-tests/build.gradle
apply plugin: 'com.android.library'
apply plugin: 'com.f2prateek.javafmt'
+
apply from: rootProject.file('gradle/android.gradle')
dependencies {

MODIFY
analytics-wear/build.gradle
analytics-wear/build.gradle
apply plugin: 'com.android.library'
apply plugin: 'com.f2prateek.javafmt'
+
apply from: rootProject.file('gradle/android.gradle')
dependencies {
compile project(':analytics')
+
compile 'com.google.android.gms:play-services-wearable:9.4.0'
}

MODIFY
analytics/build.gradle
analytics/build.gradle
apply plugin: 'com.android.library'
apply plugin: 'com.vanniktech.android.junit.jacoco'
apply plugin: 'com.f2prateek.javafmt'
+
apply from: rootProject.file('gradle/android.gradle')
dependencies {

MODIFY
build.gradle
build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'
classpath 'com.f2prateek.javafmt:javafmt:0.1.2'
}
@@ -39,7 +39,7 @@ ext {
minSdkVersionWear = 21
targetSdkVersion = 23
compileSdkVersion = 23
- buildToolsVersion = '23.0.1'
+ buildToolsVersion = '25.0.0'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7

MODIFY
circle.yml
circle.yml
-general:
- artifacts:
- - analytics-core/build/test-report
- - analytics-integrations/*/build/test-report
- - build/reports/profile
-
machine:
environment:
- ANDROID_HOME: /home/ubuntu/android
CIRCLE_JDK_VERSION: oraclejdk8
java:
version: oraclejdk8
dependencies:
cache_directories:
- - /home/ubuntu/.android
- - /home/ubuntu/android
- /home/ubuntu/.gradle
- /home/ubuntu/.m2
override:
- - .buildscript/setup.sh
+ - cp -R .buildscript/licenses $ANDROID_HOME/licenses
- TERM=dumb ./gradlew dependencies
test:
override:
- - TERM=dumb ./gradlew build --profile
+ - TERM=dumb ./gradlew build
post:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

MODIFY
gradle/android.gradle
gradle/android.gradle
@@ -32,6 +32,6 @@ android {
}
lintOptions {
- disable 'InvalidPackage'
+ disable 'InvalidPackage', 'GradleCompatible'
}
}

MODIFY
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
-#Thu Sep 01 12:22:28 MDT 2016
+#Thu Mar 02 15:09:36 PST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

update build tools and gradle

Updates CI config to use auto downloading artifacts.