migrate to AndroidX

heinrichreimer · Jan 5, 2019 · d0220b0 · d0220b0
1 parent 7221502
commit d0220b0
Show file tree

Hide file tree

Showing 38 changed files with 97 additions and 97 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ android {
     }
 }
 dependencies {
-    compile 'com.heinrichreimersoftware:material-intro:1.6.2'
+    implementation 'com.heinrichreimersoftware:material-intro:1.6.2'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,13 +6,12 @@ def versionPatch = 2
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.heinrichreimersoftware.materialintro.demo"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}")
     }
@@ -36,12 +35,12 @@ android {
 dependencies {
     compile project(':library')
     //Support
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
+    implementation 'com.google.android.material:material:1.0.0-beta01'
     //Firebase
-    implementation 'com.google.firebase:firebase-core:12.0.1'
-    implementation 'com.google.firebase:firebase-crash:12.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.6'
+    implementation 'com.google.firebase:firebase-crash:16.2.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/FinishActivity.java
@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/LoginFragment.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.demo;
 
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;

diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainActivity.java
@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/MainIntroActivity.java
@@ -27,7 +27,7 @@
 import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;

diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/SplashActivity.java
@@ -25,10 +25,10 @@
 package com.heinrichreimersoftware.materialintro.demo;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.heinrichreimersoftware.materialintro.demo.databinding.ActivitySplashBinding;
 

diff --git a/app/src/main/res/layout-land/slide_canteen.xml b/app/src/main/res/layout-land/slide_canteen.xml
@@ -46,7 +46,7 @@
             tools:ignore="ContentDescription"
             tools:src="@android:drawable/sym_action_call" />
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="@dimen/mi_baseline"
             android:layout_height="wrap_content" />
 

diff --git a/app/src/main/res/layout/activity_finish.xml b/app/src/main/res/layout/activity_finish.xml
@@ -31,7 +31,7 @@
         android:orientation="vertical"
         tools:context="com.heinrichreimersoftware.materialintro.demo.FinishActivity">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -43,7 +43,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"

diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.3.0-rc03'
+        classpath 'com.google.gms:google-services:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -11,4 +11,6 @@
 # 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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 05 21:26:55 EDT 2018
+#Sat Jan 05 11:43:12 EET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,12 +6,11 @@ def versionPatch = 2
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}")
     }
@@ -29,6 +28,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
 }
diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/ButtonCtaFragment.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/ButtonCtaFragment.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 public interface ButtonCtaFragment {

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java
@@ -43,24 +43,24 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.InterpolatorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.util.Pair;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.InterpolatorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.util.Pair;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;

diff --git a/...c/main/java/com/heinrichreimersoftware/materialintro/app/OnNavigationBlockedListener.java b/...c/main/java/com/heinrichreimersoftware/materialintro/app/OnNavigationBlockedListener.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/SlideFragment.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/SlideFragment.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.app;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 public class SlideFragment extends Fragment implements IntroNavigation {

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/ButtonCtaSlide.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/ButtonCtaSlide.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 public interface ButtonCtaSlide extends Slide {

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/FragmentSlide.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/FragmentSlide.java
@@ -27,12 +27,12 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.Fragment;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.annotation.ColorRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.view.ContextThemeWrapper;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/RestorableSlide.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/RestorableSlide.java
@@ -24,7 +24,7 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 public interface RestorableSlide extends Slide {
     void setFragment(Fragment fragment);

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SimpleSlide.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SimpleSlide.java
@@ -28,17 +28,17 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/Slide.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/Slide.java
@@ -24,8 +24,8 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.ColorRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.ColorRes;
+import androidx.fragment.app.Fragment;
 
 public interface Slide {
     Fragment getFragment();

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SlideAdapter.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/slide/SlideAdapter.java
@@ -24,11 +24,11 @@
 
 package com.heinrichreimersoftware.materialintro.slide;
 
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
 
 import com.heinrichreimersoftware.materialintro.app.SlideFragment;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/util/AnimUtils.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/util/AnimUtils.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/view/FadeableViewPager.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/view/FadeableViewPager.java
@@ -27,8 +27,8 @@
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/view/InkPageIndicator.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/view/InkPageIndicator.java
@@ -27,8 +27,8 @@
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.ColorInt;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;

diff --git a/.../src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java b/.../src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java
@@ -27,7 +27,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

diff --git a/...rc/main/java/com/heinrichreimersoftware/materialintro/view/parallax/ParallaxFragment.java b/...rc/main/java/com/heinrichreimersoftware/materialintro/view/parallax/ParallaxFragment.java
@@ -1,9 +1,9 @@
 package com.heinrichreimersoftware.materialintro.view.parallax;
 
 import android.os.Bundle;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 import com.heinrichreimersoftware.materialintro.view.parallax.util.ParallaxUtil;