Core updates + Migrate to AndroidX + targetSdkVersion 29

build.gradle

@@ -1,21 +1,25 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
+        google()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
         jcenter()
         maven {
             url "https://nexus.eastbanctech.ru/content/repositories/releases/"

gradle.properties

@@ -15,4 +15,8 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
+
+android.enableUnitTestBinaryResources=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat May 27 22:05:03 KRAT 2017
+#Thu Mar 19 13:28:18 NOVT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

reamplib/build.gradle

@@ -3,12 +3,14 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
+
+    testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion 19
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -24,65 +26,65 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.3.2"
-    testCompile "org.robolectric:shadows-support-v4:3.3.2"
-    compile 'com.android.support:appcompat-v7:25.3.1'
-}
-
-def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
-}
-
-def getReleaseRepositoryUrl() {
-    return hasProperty("RELEASE_REPOSITORY_URL") ? RELEASE_REPOSITORY_URL : ""
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.mockito:mockito-core:2.25.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
 
-def getSnapshotRepositoryUrl() {
-    return ghasProperty("SNAPSHOT_REPOSITORY_URL") ? SNAPSHOT_REPOSITORY_URL : ""
-}
-
-def getRepositoryUsername() {
-    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
-}
+//def isReleaseBuild() {
+//    return VERSION_NAME.contains("SNAPSHOT") == false
+//}
+//
+//def getReleaseRepositoryUrl() {
+//    return hasProperty("RELEASE_REPOSITORY_URL") ? RELEASE_REPOSITORY_URL : ""
+//}
+//
+//def getSnapshotRepositoryUrl() {
+//    return ghasProperty("SNAPSHOT_REPOSITORY_URL") ? SNAPSHOT_REPOSITORY_URL : ""
+//}
+//
+//def getRepositoryUsername() {
+//    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
+//}
+//
+//def getRepositoryPassword() {
+//    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
+//}
 
 tasks.withType(Javadoc) {
     failOnError false
 }
 
-ext {
-    bintrayRepo = 'Reamp'
-    bintrayName = 'Reamp'
-    bintrayOrg = 'eastbanctechru'
-
-    publishedGroupId = 'etr.android.reamp'
-    libraryName = 'Reamp'
-    artifact = 'reamp'
-
-    libraryDescription = 'Reamp'
-
-    siteUrl = 'https://github.com/eastbanctechru/Reamp'
-    gitUrl = 'https://github.com/eastbanctechru/Reamp.git'
-
-    libraryVersion = '1.0.2'
-
-    developerId = 'eastbanctechru'
-    developerName = 'EastBanc Technologies'
-    developerEmail = 'info@eastbanctech.ru'
-
-    licenseName = 'The MIT License'
-    licenseUrl = 'https://opensource.org/licenses/MIT'
-    allLicenses = ["MIT"]
-}
-
+//ext {
+//    bintrayRepo = 'Reamp'
+//    bintrayName = 'Reamp'
+//    bintrayOrg = 'eastbanctechru'
+//
+//    publishedGroupId = 'etr.android.reamp'
+//    libraryName = 'Reamp'
+//    artifact = 'reamp'
+//
+//    libraryDescription = 'Reamp'
+//
+//    siteUrl = 'https://github.com/eastbanctechru/Reamp'
+//    gitUrl = 'https://github.com/eastbanctechru/Reamp.git'
+//
+//    libraryVersion = '1.0.2'
+//
+//    developerId = 'eastbanctechru'
+//    developerName = 'EastBanc Technologies'
+//    developerEmail = 'info@eastbanctech.ru'
+//
+//    licenseName = 'The MIT License'
+//    licenseUrl = 'https://opensource.org/licenses/MIT'
+//    allLicenses = ["MIT"]
+//}
+//
 apply from: '../jacoco.gradle'
-
-if (project.rootProject.file('local.properties').exists()) {
-    apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-    apply from: './bintray.gradle'
-}
+//
+//if (project.rootProject.file('local.properties').exists()) {
+//    apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+//    apply from: './bintray.gradle'
+//}

reamplib/src/main/java/etr/android/reamp/functional/ConsumerNonNull.java

@@ -0,0 +1,7 @@
+package etr.android.reamp.functional;
+
+import androidx.annotation.NonNull;
+
+public interface ConsumerNonNull<T> {
+    void consume(@NonNull T t);
+}

reamplib/src/main/java/etr/android/reamp/mvp/Action.java

@@ -1,7 +1,11 @@
 package etr.android.reamp.mvp;
 
+import androidx.annotation.NonNull;
+
 import java.io.Serializable;
 
+import etr.android.reamp.functional.ConsumerNonNull;
+
 /**
  * A handy container-class which can be used to store "one-shot" data into {@link ReampStateModel}
  * <br/>
@@ -16,11 +20,16 @@ public class Action<T extends Serializable> implements Serializable {
     private T value;
     private boolean hasAction;
 
-    public void set(T value) {
+    public void set(@NonNull T value) {
         this.value = value;
         hasAction = true;
     }
 
+    /**
+     * @deprecated use {@link Action#consume(ConsumerNonNull)}.
+     */
+    @Deprecated
+    @NonNull
     public T get() {
         if (!hasAction) {
             throw new IllegalStateException("No action yet");
@@ -31,7 +40,17 @@ public T get() {
         return result;
     }
 
+    /**
+     * @deprecated use {@link Action#consume(ConsumerNonNull)}.
+     */
+    @Deprecated
     public boolean hasAction() {
         return hasAction;
     }
+
+    public void consume(@NonNull ConsumerNonNull<T> consumer) {
+        if (hasAction()) {
+            consumer.consume(get());
+        }
+    }
 }

reamplib/src/main/java/etr/android/reamp/mvp/EmptyAction.java

@@ -0,0 +1,21 @@
+package etr.android.reamp.mvp;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class EmptyAction implements Serializable {
+
+    private boolean hasAction;
+
+    public void set() {
+        hasAction = true;
+    }
+
+    public void consume(@NonNull Runnable consumer) {
+        if (hasAction) {
+            hasAction = false;
+            consumer.run();
+        }
+    }
+}

reamplib/src/main/java/etr/android/reamp/mvp/MvpDelegate.java

@@ -3,10 +3,15 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import android.util.Log;
 
 import java.util.List;
 import java.util.UUID;
 
+import etr.android.reamp.navigation.ResultProvider;
+
 /**
  * A proxy class between {@link ReampView} and {@link ReampPresenter} which should be used
  * while implementing a custom {@link ReampView}.
@@ -21,12 +26,16 @@ public class MvpDelegate {
     private String mvpId;
     private ReampPresenter presenter;
     private StateChanges stateChanges;
+    private boolean isDestroyed = false;
 
     public MvpDelegate(ReampView view) {
         this.view = view;
     }
 
     public <P extends ReampPresenter<SM>, SM extends ReampStateModel> P getPresenter() {
+        if (isDestroyed) {
+            Log.e(TAG, "MvpDelegate#getPresenter was called after onDestroy.", new IllegalStateException());
+        }
         return (P) presenter;
     }
 
@@ -107,7 +116,8 @@ public void onSaveInstanceState(Bundle outState) {
     public void onDestroy() {
         ReampPresenter presenter = view.getPresenter();
         presenter.removeView(view);
-        this.presenter = null;
+        isDestroyed = true;
+        // Don't set presenter to null, because there are a lot of crashes, when view calls getPresenter() after onDestroy.
     }
 
     /**
@@ -119,11 +129,19 @@ public void onResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    public void onResult(@NonNull ResultProvider resultProvider) {
+        view.getPresenter().onResult(resultProvider);
+    }
+
     private void dispatchResult(int requestCode, int resultCode, Intent data) {
         List<ReampView> views = PresenterManager.getInstance().getViewsOf(view.getContext());
         for (ReampView reampView : views) {
             ReampPresenter presenter = reampView.getPresenter();
             if (presenter != null) {
+                presenter.onResult(new ResultProvider.Android(view.getPresenter().getNavigation(), requestCode, resultCode, data));
+
+                // Call it for backward compatibility.
                 presenter.onResult(requestCode, resultCode, data);
             }
         }

reamplib/src/main/java/etr/android/reamp/mvp/ReampAppCompatActivity.java

@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import etr.android.reamp.R;

reamplib/src/main/java/etr/android/reamp/mvp/ReampFragment.java

@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 
 import etr.android.reamp.R;