diff --git a/android/autodispose-android-archcomponents-test/build.gradle b/android/autodispose-android-archcomponents-test/build.gradle index 37ce95fbe..ec9b7ffe5 100644 --- a/android/autodispose-android-archcomponents-test/build.gradle +++ b/android/autodispose-android-archcomponents-test/build.gradle @@ -55,7 +55,6 @@ dependencies { provided deps.misc.errorProneAnnotations provided deps.misc.javaxExtras - errorprone deps.build.checkerFramework errorprone deps.build.errorProne } diff --git a/android/autodispose-android-archcomponents/build.gradle b/android/autodispose-android-archcomponents/build.gradle index 2fad29674..2c06d10b7 100644 --- a/android/autodispose-android-archcomponents/build.gradle +++ b/android/autodispose-android-archcomponents/build.gradle @@ -60,7 +60,6 @@ dependencies { provided deps.misc.errorProneAnnotations provided deps.misc.javaxExtras - errorprone deps.build.checkerFramework errorprone deps.build.errorProne androidTestCompile project(':android:autodispose-android-archcomponents-test') diff --git a/android/autodispose-android/build.gradle b/android/autodispose-android/build.gradle index 1a2de0b28..b382eed4c 100755 --- a/android/autodispose-android/build.gradle +++ b/android/autodispose-android/build.gradle @@ -57,7 +57,6 @@ dependencies { provided deps.misc.errorProneAnnotations provided deps.misc.javaxExtras - errorprone deps.build.checkerFramework errorprone deps.build.errorProne androidTestCompile project(':test-utils') diff --git a/autodispose-rxlifecycle/build.gradle b/autodispose-rxlifecycle/build.gradle index 69f655287..a2ca50494 100644 --- a/autodispose-rxlifecycle/build.gradle +++ b/autodispose-rxlifecycle/build.gradle @@ -45,7 +45,6 @@ dependencies { compileOnly deps.misc.errorProneAnnotations compileOnly deps.misc.javaxExtras - errorprone deps.build.checkerFramework errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/autodispose/build.gradle b/autodispose/build.gradle index 7d00387fc..59faa625d 100755 --- a/autodispose/build.gradle +++ b/autodispose/build.gradle @@ -43,7 +43,6 @@ dependencies { compileOnly deps.misc.errorProneAnnotations compileOnly deps.misc.javaxExtras - errorprone deps.build.checkerFramework errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/build.gradle b/build.gradle index bd36205cb..e103639e2 100755 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ subprojects { } task wrapper(type: Wrapper) { - gradleVersion = '4.3.1' + gradleVersion = '4.4.1' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d9c29e333..1dd6425dc 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -15,13 +15,13 @@ */ def versions = [ - androidTest: '0.5', + androidTest: '1.0.1', archComponents: '1.0.0', archRuntime: '1.0.3', dokka: '0.9.15', - errorProne: '2.1.3', - kotlin: '1.2.0', - support: '26.1.0' + errorProne: '2.2.0', + kotlin: '1.2.20', + support: '27.0.2' ] def apt = [ @@ -29,17 +29,16 @@ def apt = [ ] def build = [ - buildToolsVersion: '26.0.2', - compileSdkVersion: 26, + buildToolsVersion: '27.0.3', + compileSdkVersion: 27, ci: 'true' == System.getenv('CI'), minSdkVersion: 14, - targetSdkVersion: 26, + targetSdkVersion: 27, - checkerFramework: 'org.checkerframework:dataflow:2.3.0', errorProne: "com.google.errorprone:error_prone_core:${versions.errorProne}", errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}", errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}", - nullAway: 'com.uber.nullaway:nullaway:0.2.0', + nullAway: 'com.uber.nullaway:nullaway:0.3.2', repositories: [ plugins: 'https://plugins.gradle.org/m2/' @@ -63,7 +62,7 @@ def misc = [ errorProneAnnotations: "com.google.errorprone:error_prone_annotations:${versions.errorProne}", javaxExtras: "com.uber.javaxextras:javax-extras:0.1.0", jsr305: 'com.google.code.findbugs:jsr305:3.0.2', - rxlifecycle: 'com.trello.rxlifecycle2:rxlifecycle:2.2.0' + rxlifecycle: 'com.trello.rxlifecycle2:rxlifecycle:2.2.1' ] def rx = [ @@ -86,7 +85,7 @@ def test = [ androidRunner: "com.android.support.test:runner:${versions.androidTest}", androidRules: "com.android.support.test:rules:${versions.androidTest}", junit: 'junit:junit:4.12', - truth: 'com.google.truth:truth:0.36' + truth: 'com.google.truth:truth:0.39' ] ext.deps = [ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ed88a042a..6b6ea3ab4 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 702c4b68b..57c7d2d22 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 6c0e08812..3ec4cd39f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -53,7 +53,7 @@ dependencies { compile project(':android:autodispose-android-archcomponents') compile project(':autodispose') compile project(':autodispose-kotlin') - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support.constraint:constraint-layout:1.1.0-beta1' - compile 'com.android.support:design:26.1.0' + compile 'com.android.support:appcompat-v7:27.0.2' + compile 'com.android.support.constraint:constraint-layout:1.1.0-beta4' + compile 'com.android.support:design:27.0.2' } diff --git a/settings.gradle b/settings.gradle index f18299270..72d2078f8 100755 --- a/settings.gradle +++ b/settings.gradle @@ -15,16 +15,18 @@ */ rootProject.name = 'autodispose-root' -include ':android:autodispose-android' -include ':android:autodispose-android-kotlin' -include ':android:autodispose-android-archcomponents' -include ':android:autodispose-android-archcomponents-kotlin' -include ':android:autodispose-android-archcomponents-test' -include ':android:autodispose-android-archcomponents-test-kotlin' +if (System.getenv("ANDROID_HOME") != null) { + include ':android:autodispose-android' + include ':android:autodispose-android-kotlin' + include ':android:autodispose-android-archcomponents' + include ':android:autodispose-android-archcomponents-kotlin' + include ':android:autodispose-android-archcomponents-test' + include ':android:autodispose-android-archcomponents-test-kotlin' + include ':sample' +} include ':autodispose' include ':autodispose-kotlin' include 'autodispose-rxlifecycle' -include ':sample' include ':test-utils' include ':static-analysis:autodispose-error-prone-checker' diff --git a/static-analysis/autodispose-error-prone-checker/build.gradle b/static-analysis/autodispose-error-prone-checker/build.gradle index bbec49884..428bbd6c6 100644 --- a/static-analysis/autodispose-error-prone-checker/build.gradle +++ b/static-analysis/autodispose-error-prone-checker/build.gradle @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2017. Uber Technologies + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id "net.ltgt.errorprone" version "0.0.13" id "java-library"