Update everything in the build to latest.

AGP 3.0b5, tools, sdk, support libraries.

.travis.yml

@@ -4,21 +4,30 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.1
-    - extra-android-m2repository
-    - android-25
-    - sys-img-armeabi-v7a-android-18
 
 jdk:
   - oraclejdk8
 
+before_install:
+  # Install SDK license so Android Gradle plugin can install deps.
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  # Install the rest of tools (e.g., avdmanager)
+  - sdkmanager tools
+  # Install the system image
+  - sdkmanager "system-images;android-18;default;armeabi-v7a"
+  # Create and start emulator for the script. Meant to race the install task.
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-18;default;armeabi-v7a"
+  - $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window &
+
+install: ./gradlew clean assemble assembleAndroidTest --stacktrace
+
 before_script:
-  # Create and start an emulator for instrumentation tests.
-  - echo no | android create avd --force -n test -t android-18 --abi armeabi-v7a
-  - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82
 
+script: ./gradlew check connectedCheck --stacktrace
+
 after_success:
   - .buildscript/deploy_snapshot.sh
 

build.gradle

@@ -1,49 +1,55 @@
-allprojects {
-  buildscript {
-    repositories {
-      mavenCentral()
-      jcenter()
-    }
+buildscript {
+  ext.versions = [
+      'minSdk': 14,
+      'compileSdk': 26,
+      'buildTools': '26.0.1',
+      'kotlin': '1.1.4-2',
+  ]
+
+  repositories {
+    mavenCentral()
+    google()
+    jcenter()
   }
 
+  dependencies {
+    classpath 'com.android.tools.build:gradle:3.0.0-beta5'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
+  }
+}
+
+allprojects {
   repositories {
     mavenCentral()
+    google()
   }
 
   group = GROUP
   version = VERSION_NAME
 }
 
 ext {
-  minSdkVersion = 9
-  compileSdkVersion = 25
-  buildToolsVersion = '25.0.1'
-  kotlinVersion = '1.1.2-4'
-
-  androidPlugin = 'com.android.tools.build:gradle:2.2.2'
-  kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-
   sqlBriteV1 = 'com.squareup.sqlbrite:sqlbrite:1.1.2'
 
   // Android dependencies.
-  supportV4 = 'com.android.support:support-v4:25.3.1'
-  supportAnnotations = 'com.android.support:support-annotations:25.3.1'
+  supportV4 = 'com.android.support:support-v4:26.0.2'
+  supportAnnotations = 'com.android.support:support-annotations:26.0.2'
   supportTestRunner = 'com.android.support.test:runner:0.5'
 
   // Third-party dependencies.
-  kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-  dagger = 'com.google.dagger:dagger:2.8'
-  daggerCompiler = 'com.google.dagger:dagger-compiler:2.8'
-  butterKnifeRuntime = 'com.jakewharton:butterknife:8.4.0'
-  butterKnifeCompiler = 'com.jakewharton:butterknife-compiler:8.4.0'
-  timber = 'com.jakewharton.timber:timber:4.3.1'
-  autoValue = 'com.google.auto.value:auto-value:1.3'
+  kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
+  dagger = 'com.google.dagger:dagger:2.11'
+  daggerCompiler = 'com.google.dagger:dagger-compiler:2.11'
+  butterKnifeRuntime = 'com.jakewharton:butterknife:8.8.1'
+  butterKnifeCompiler = 'com.jakewharton:butterknife-compiler:8.8.1'
+  timber = 'com.jakewharton.timber:timber:4.5.1'
+  autoValue = 'com.google.auto.value:auto-value:1.5'
   autoValueParcel = 'com.ryanharter.auto.value:auto-value-parcel:0.2.5'
-  rxJava = 'io.reactivex.rxjava2:rxjava:2.1.0'
+  rxJava = 'io.reactivex.rxjava2:rxjava:2.1.3'
   rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.1'
   rxBinding = 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
   junit = 'junit:junit:4.12'
-  truth = 'com.google.truth:truth:0.30'
+  truth = 'com.google.truth:truth:0.35'
 }
 
 configurations {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jun 04 13:01:53 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

sample/build.gradle

@@ -1,9 +1,3 @@
-buildscript {
-  dependencies {
-    classpath rootProject.ext.androidPlugin
-  }
-}
-
 apply plugin: 'com.android.application'
 
 dependencies {
@@ -36,8 +30,8 @@ def isCi() {
 }
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
+  compileSdkVersion versions.compileSdk
+  buildToolsVersion versions.buildTools
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_7
@@ -55,8 +49,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 14
-    targetSdkVersion 23
+    minSdkVersion versions.minSdk
+    targetSdkVersion versions.compileSdk
     applicationId 'com.example.sqlbrite.todo'
 
     versionCode 1

sqlbrite-interop/build.gradle

@@ -1,9 +1,3 @@
-buildscript {
-  dependencies {
-    classpath rootProject.ext.androidPlugin
-  }
-}
-
 apply plugin: 'com.android.library'
 
 dependencies {
@@ -19,11 +13,11 @@ def isCi() {
 }
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
+  compileSdkVersion versions.compileSdk
+  buildToolsVersion versions.buildTools
 
   defaultConfig {
-    minSdkVersion rootProject.ext.minSdkVersion
+    minSdkVersion versions.minSdk
 
     testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
   }
@@ -42,12 +36,6 @@ android {
     textReport true
   }
 
-  buildTypes {
-    debug {
-      testCoverageEnabled true
-    }
-  }
-
   packagingOptions {
     exclude 'META-INF/rxjava.properties'
   }

sqlbrite-kotlin/build.gradle

@@ -1,10 +1,3 @@
-buildscript {
-  dependencies {
-    classpath rootProject.ext.androidPlugin
-    classpath rootProject.ext.kotlinPlugin
-  }
-}
-
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
@@ -18,11 +11,11 @@ def isCi() {
 }
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
+  compileSdkVersion versions.compileSdk
+  buildToolsVersion versions.buildTools
 
   defaultConfig {
-    minSdkVersion rootProject.ext.minSdkVersion
+    minSdkVersion versions.minSdk
   }
 
   compileOptions {
@@ -38,12 +31,6 @@ android {
     textOutput 'stdout'
     textReport true
   }
-
-  buildTypes {
-    debug {
-      testCoverageEnabled true
-    }
-  }
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

sqlbrite/build.gradle

@@ -1,9 +1,3 @@
-buildscript {
-  dependencies {
-    classpath rootProject.ext.androidPlugin
-  }
-}
-
 apply plugin: 'com.android.library'
 
 dependencies {
@@ -19,11 +13,11 @@ def isCi() {
 }
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
+  compileSdkVersion versions.compileSdk
+  buildToolsVersion versions.buildTools
 
   defaultConfig {
-    minSdkVersion rootProject.ext.minSdkVersion
+    minSdkVersion versions.minSdk
 
     testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
   }
@@ -42,12 +36,6 @@ android {
     textReport true
   }
 
-  buildTypes {
-    debug {
-      testCoverageEnabled true
-    }
-  }
-
   packagingOptions {
     exclude 'LICENSE.txt'
   }