From 0cb3099d14fdf0bbf83438e252e5fd393a09906b Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Wed, 14 Jun 2017 17:55:17 +0300 Subject: [PATCH 1/4] remove retrolambda --- build.gradle | 7 +++---- .../observables/collections/ObservableFilteredList.java | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a50e17e..df5db71 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.library' -apply plugin: 'me.tatarka.retrolambda' android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.0' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -16,7 +15,7 @@ android { } dependencies { - provided 'com.android.support:support-annotations:25.3.1' + provided 'com.android.support:support-annotations:26.0.0-beta2' provided 'io.reactivex.rxjava2:rxandroid:2.0.1' provided 'io.reactivex.rxjava2:rxjava:2.1.0' } diff --git a/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java b/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java index d429b18..6efbc80 100644 --- a/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java +++ b/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java @@ -9,6 +9,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Executors; +import io.reactivex.Scheduler; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; From 20951bed03143e304dc9f7db95a9e7a0f6d8832b Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Mon, 19 Jun 2017 18:24:02 +0300 Subject: [PATCH 2/4] revert retrolambda --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index df5db71..c162c24 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion 26 From 4166445bc67a11e1302a9d58139d10f236038e20 Mon Sep 17 00:00:00 2001 From: Denis Karmyshakov Date: Tue, 25 Jul 2017 19:54:06 +0300 Subject: [PATCH 3/4] Build tools update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c976ef8..9fd9942 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion 26 - buildToolsVersion '26.0.0' + buildToolsVersion '26.0.1' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From ac6b3e85ac676a3c180ef27b35f27d1222751942 Mon Sep 17 00:00:00 2001 From: Denis Karmyshakov Date: Thu, 3 Aug 2017 18:15:24 +0300 Subject: [PATCH 4/4] Support lib update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9fd9942..0fdc41e 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ android { } dependencies { - provided 'com.android.support:support-annotations:26.0.0-beta2' + provided 'com.android.support:support-annotations:26.0.0' provided 'io.reactivex.rxjava2:rxandroid:2.0.1' provided 'io.reactivex.rxjava2:rxjava:2.1.2' }