Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ dependencies {
provided deps.misc.errorProneAnnotations
provided deps.misc.javaxExtras

errorprone deps.build.checkerFramework
errorprone deps.build.errorProne
}

Expand Down
1 change: 0 additions & 1 deletion android/autodispose-android-archcomponents/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion android/autodispose-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion autodispose-rxlifecycle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion autodispose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
21 changes: 10 additions & 11 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,30 @@
*/

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 = [
autoService : "com.google.auto.service:auto-service:1.0-rc4",
]

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/'
Expand All @@ -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 = [
Expand All @@ -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 = [
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
16 changes: 9 additions & 7 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

16 changes: 16 additions & 0 deletions static-analysis/autodispose-error-prone-checker/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand Down