Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #74

Merged
merged 8 commits into from
Aug 21, 2017
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ android:
components:
- tools # Tools
- platform-tools # Platform tools
- build-tools-25.0.2 # Build tools version
- android-25 # Target SDK version
- build-tools-26.0.1 # Build tools version
- android-26 # Target SDK version
- extra-android-m2repository # Support repo
- sys-img-armeabi-v7a-android-18 # Emulator

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.uber.autodispose.android;

import com.google.common.truth.Platform;
import io.reactivex.CompletableObserver;
import io.reactivex.MaybeObserver;
import io.reactivex.Observer;
Expand Down Expand Up @@ -87,7 +86,7 @@ public boolean hasNextEvent() {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
return event != null && Platform.isInstanceOfType(event, OnNext.class);
return event != null && OnNext.class.isInstance(event);
}

public T takeNext() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.uber.autodispose;

import com.google.common.truth.Platform;
import io.reactivex.CompletableObserver;
import io.reactivex.MaybeObserver;
import io.reactivex.Observer;
Expand Down Expand Up @@ -82,7 +81,7 @@ public boolean hasNextEvent() {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
return event != null && Platform.isInstanceOfType(event, OnNext.class);
return event != null && OnNext.class.isInstance(event);
}

public T takeNext() {
Expand Down Expand Up @@ -127,7 +126,7 @@ private OnNext(T value) {
}
}

private final class OnCompleted {
private static final class OnCompleted {
@Override public String toString() {
return "OnCompleted";
}
Expand All @@ -145,7 +144,7 @@ private OnError(Throwable throwable) {
}
}

private final class OnSubscribe {
private static final class OnSubscribe {
private final Disposable disposable;

private OnSubscribe(Disposable disposable) {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ subprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '3.5'
gradleVersion = '4.1'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}

Expand Down
12 changes: 6 additions & 6 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@

def versions = [
androidTest: '0.5',
errorProne: '2.0.19',
kotlin: '1.1.2',
errorProne: '2.0.21',
kotlin: '1.1.4-2',
support: '25.1.0'
]

def build = [
buildToolsVersion: '25.0.2',
compileSdkVersion: 25,
buildToolsVersion: '26.0.1',
compileSdkVersion: 26,
ci: 'true' == System.getenv('CI'),
minSdkVersion: 14,
targetSdkVersion: 25,
targetSdkVersion: 26,
errorProne: "com.google.errorprone:error_prone_core:${versions.errorProne}",

repositories: [
Expand Down Expand Up @@ -62,7 +62,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.32'
truth: 'com.google.truth:truth:0.34'
]

ext.deps = [
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Apr 29 13:36:17 PDT 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
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 " "
}
Expand Down