Migrate to AndroidX

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

gradle.properties

@@ -17,4 +17,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+android.enableJetifier=true
+android.useAndroidX=true
 VERSION_NAME=1.3.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Nov 02 07:53:43 CET 2017
+#Wed Feb 13 17:35:05 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

library/build.gradle

@@ -2,16 +2,15 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName VERSION_NAME
         consumerProguardFiles 'proguard-rules.pro'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -26,13 +25,12 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-fragment:27.1.0'
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation 'com.android.support:support-v4:27.1.0'
+    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    androidTestImplementation 'androidx.test:rules:1.1.2-alpha01'
 }
 
 task androidJavadocs(type: Javadoc) {

library/src/androidTest/java/eu/inloop/viewmodel/ViewModelActivityTest.java

@@ -2,11 +2,11 @@
 
 
 import android.content.pm.ActivityInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivity.java

@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.widget.LinearLayout;
 
 import eu.inloop.viewmodel.base.ViewModelBaseActivity;

library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivityViewModel.java

@@ -1,8 +1,8 @@
 package eu.inloop.viewmodel.fixture.activity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import eu.inloop.viewmodel.AbstractViewModel;
 

library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragment.java

@@ -1,8 +1,8 @@
 package eu.inloop.viewmodel.fixture.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragmentViewModel.java

@@ -1,8 +1,8 @@
 package eu.inloop.viewmodel.fixture.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import eu.inloop.viewmodel.AbstractViewModel;
 

library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java

@@ -3,11 +3,11 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.CallSuper;
+import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.View;
 

library/src/main/java/eu/inloop/viewmodel/IView.java

@@ -1,7 +1,7 @@
 package eu.inloop.viewmodel;
 
 import android.app.Activity;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import eu.inloop.viewmodel.base.ViewModelBaseActivity;
 import eu.inloop.viewmodel.base.ViewModelBaseFragment;

library/src/main/java/eu/inloop/viewmodel/IViewModelProvider.java

@@ -1,6 +1,6 @@
 package eu.inloop.viewmodel;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Your {@link android.app.Activity} must implement this interface if

library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java

@@ -1,11 +1,10 @@
 package eu.inloop.viewmodel;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;

library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java

@@ -2,12 +2,12 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 
@@ -34,7 +34,7 @@ public class ViewModelHelper<T extends IView, R extends AbstractViewModel<T>> {
 
     /**
      * Call from {@link android.app.Activity#onCreate(android.os.Bundle)} or
-     * {@link android.support.v4.app.Fragment#onCreate(android.os.Bundle)}
+     * {@link androidx.core.app.Fragment#onCreate(android.os.Bundle)}
      *
      * @param activity           parent activity
      * @param savedInstanceState savedInstance state from {@link Activity#onCreate(Bundle)} or
@@ -86,7 +86,7 @@ public void onCreate(@NonNull Activity activity,
     }
 
     /**
-     * Call from {@link android.support.v4.app.Fragment#onViewCreated(android.view.View, android.os.Bundle)}
+     * Call from {@link androidx.core.app.Fragment#onViewCreated(android.view.View, android.os.Bundle)}
      * or {@link android.app.Activity#onCreate(android.os.Bundle)}
      *
      * @param view view
@@ -133,8 +133,8 @@ public void performBinding(@NonNull final IView bindingView) {
     }
 
     /**
-     * Use in case this model is associated with an {@link android.support.v4.app.Fragment}
-     * Call from {@link android.support.v4.app.Fragment#onDestroyView()}. Use in case model is associated
+     * Use in case this model is associated with an {@link androidx.core.app.Fragment}
+     * Call from {@link androidx.core.app.Fragment#onDestroyView()}. Use in case model is associated
      * with Fragment
      *
      * @param fragment fragment
@@ -152,8 +152,8 @@ public void onDestroyView(@NonNull Fragment fragment) {
     }
 
     /**
-     * Use in case this model is associated with an {@link android.support.v4.app.Fragment}
-     * Call from {@link android.support.v4.app.Fragment#onDestroy()}
+     * Use in case this model is associated with an {@link androidx.core.app.Fragment}
+     * Call from {@link androidx.core.app.Fragment#onDestroy()}
      *
      * @param fragment fragment
      */
@@ -194,7 +194,7 @@ public void onDestroy(@NonNull final Activity activity) {
     }
 
     /**
-     * Call from {@link android.app.Activity#onStop()} or {@link android.support.v4.app.Fragment#onStop()}
+     * Call from {@link android.app.Activity#onStop()} or {@link androidx.core.app.Fragment#onStop()}
      */
     public void onStop() {
         if (mViewModel == null) {
@@ -205,7 +205,7 @@ public void onStop() {
     }
 
     /**
-     * Call from {@link android.app.Activity#onStart()} ()} or {@link android.support.v4.app.Fragment#onStart()} ()}
+     * Call from {@link android.app.Activity#onStart()} ()} or {@link androidx.core.app.Fragment#onStart()} ()}
      */
     public void onStart() {
         if (mViewModel == null) {
@@ -234,7 +234,7 @@ public R getViewModel() {
 
     /**
      * Call from {@link android.app.Activity#onSaveInstanceState(android.os.Bundle)}
-     * or {@link android.support.v4.app.Fragment#onSaveInstanceState(android.os.Bundle)}.
+     * or {@link androidx.core.app.Fragment#onSaveInstanceState(android.os.Bundle)}.
      * This allows the model to save its state.
      *
      * @param bundle bundle

library/src/main/java/eu/inloop/viewmodel/ViewModelProvider.java

@@ -1,18 +1,18 @@
 package eu.inloop.viewmodel;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentActivity;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Create and keep this class inside your Activity. Store it
- * in {@link android.support.v4.app.FragmentActivity#onRetainCustomNonConfigurationInstance()
- * and restore in {@link android.support.v4.app.FragmentActivity#onCreate(android.os.Bundle)} before
+ * in {@link androidx.core.app.FragmentActivity#onRetainCustomNonConfigurationInstance()
+ * and restore in {@link androidx.core.app.FragmentActivity#onCreate(android.os.Bundle)} before
  * calling the super implemenentation.
  */
 public class ViewModelProvider {

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java

@@ -1,9 +1,9 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import eu.inloop.viewmodel.AbstractViewModel;
 import eu.inloop.viewmodel.IView;

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseEmptyActivity.java

@@ -1,9 +1,9 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import eu.inloop.viewmodel.IViewModelProvider;
 import eu.inloop.viewmodel.ViewModelProvider;

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java

@@ -1,10 +1,10 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 import eu.inloop.viewmodel.AbstractViewModel;

library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java

@@ -1,13 +1,13 @@
 package eu.inloop.viewmodel.binding;
 
-import android.databinding.ViewDataBinding;
+import androidx.databinding.ViewDataBinding;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import eu.inloop.viewmodel.AbstractViewModel;
 import eu.inloop.viewmodel.IView;

library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBindingConfig.java

@@ -1,8 +1,8 @@
 package eu.inloop.viewmodel.binding;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
 
 import eu.inloop.viewmodel.BR;
 

library/src/main/java/eu/inloop/viewmodel/support/ViewModelStatePagerAdapter.java

@@ -1,9 +1,9 @@
 package eu.inloop.viewmodel.support;
 
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import android.util.Log;
 import android.view.ViewGroup;