fix

build.gradle

@@ -14,7 +14,8 @@ android {
 }
 
 dependencies {
-    compileOnly "com.android.support:support-annotations:$supportLibraryVersion"
+    compileOnly "androidx.annotation:annotation:$androidx"
     compileOnly "io.reactivex:rxandroid:$rxAndroidVersion"
     compileOnly "io.reactivex:rxjava:$rxJavaVersion"
+    compileOnly "androidx.core:core:$coreKtx"
 }

src/main/java/ru/touchin/roboswag/core/android/support/v7/util/DiffUtil.java

@@ -16,7 +16,7 @@
 
 package ru.touchin.roboswag.core.android.support.v7.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.log;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 /**

src/main/java/ru/touchin/roboswag/core/log/Lc.java

@@ -22,8 +22,8 @@ package ru.touchin.roboswag.core.log;
 import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 

src/main/java/ru/touchin/roboswag/core/log/LcGroup.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.log;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.text.SimpleDateFormat;
 import java.util.Locale;

src/main/java/ru/touchin/roboswag/core/log/LcLevel.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.log;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 /**

src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.log;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Gavriil Sitnikov on 13/11/2015.

src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java

@@ -19,14 +19,13 @@
 
 package ru.touchin.roboswag.core.observables;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 import ru.touchin.roboswag.core.utils.Optional;
 import rx.Observable;

src/main/java/ru/touchin/roboswag/core/observables/Changeable.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.core.utils.Optional;
 import rx.Observable;

src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;

src/main/java/ru/touchin/roboswag/core/observables/OnSubscribeRefCountWithCacheTime.java

@@ -16,14 +16,13 @@
 
 package ru.touchin.roboswag.core.observables;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import rx.Observable.OnSubscribe;
 import rx.Scheduler;
 import rx.Subscriber;

src/main/java/ru/touchin/roboswag/core/observables/RxAndroidUtils.java

@@ -28,8 +28,8 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
 

src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java

@@ -19,9 +19,6 @@
 
 package ru.touchin.roboswag.core.observables.collections;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -29,6 +26,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.observables.collections.changes.Change;
 import ru.touchin.roboswag.core.observables.collections.changes.CollectionChanges;
 import rx.Emitter;

src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java

@@ -1,7 +1,7 @@
 package ru.touchin.roboswag.core.observables.collections;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableList.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.collections;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/Change.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Gavriil Sitnikov on 23/05/16.

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/ChangePayloadProducer.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Functional interface for calculating change payload between two items same type.

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/CollectionChanges.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/CollectionsChangesCalculator.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/DefaultCollectionsChangesCalculator.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/DiffCollectionsChangesCalculator.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ru/touchin/roboswag/core/observables/collections/changes/SameItemsPredicate.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.changes;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Functional interface for determine same objects. Usually this is just the comparison by id.

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/LoadedItems.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.collections.loadable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.Collection;
 

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/LoadingMoreList.java

@@ -19,9 +19,6 @@
 
 package ru.touchin.roboswag.core.observables.collections.loadable;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -29,6 +26,8 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
 import ru.touchin.roboswag.core.observables.collections.ObservableList;

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/MoreItemsLoader.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.loadable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import rx.Observable;
 

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/MoreLoadRequest.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.collections.loadable;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 

src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java

@@ -19,13 +19,12 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.lang.reflect.Type;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
 import ru.touchin.roboswag.core.observables.OnSubscribeRefCountWithCacheTime;

src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.Type;
 

src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import rx.Single;
 

src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java

@@ -1,7 +1,7 @@
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.Type;
 

src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java

@@ -19,12 +19,11 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.lang.reflect.Type;
 import java.util.concurrent.TimeUnit;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.observables.storable.concrete.NonNullStorable;
 import ru.touchin.roboswag.core.utils.Optional;
 import rx.Observable;

src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.storable;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.Type;
 

src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.observables.storable.concrete;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.TimeUnit;
 

src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;

src/main/java/ru/touchin/roboswag/core/utils/Optional.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.utils;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 

src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java

@@ -21,8 +21,8 @@ package ru.touchin.roboswag.core.utils;
 
 import android.app.Service;
 import android.os.Binder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Gavriil Sitnikov on 03/10/2015.

src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Gavriil Sitnikov on 13/11/2015.

src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.security.MessageDigest;
 

src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Gavriil Sitnikov on 13/11/2015.

src/main/java/ru/touchin/roboswag/core/utils/pairs/HalfNullablePair.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.core.utils.pairs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 

src/main/java/ru/touchin/roboswag/core/utils/pairs/NonNullPair.java

@@ -19,11 +19,10 @@
 
 package ru.touchin.roboswag.core.utils.pairs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.io.Serializable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 
 /**

src/main/java/ru/touchin/roboswag/core/utils/pairs/NullablePair.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.core.utils.pairs;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;