AGP 3.4.1, API 28, androidx

crosswall · May 25, 2019 · c26c397 · c26c397
1 parent cfd75e8
commit c26c397
Show file tree

Hide file tree

Showing 28 changed files with 210 additions and 212 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "me.crosswall.coverflow.demo"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,11 +19,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile rootProject.ext.appCompat
-    compile rootProject.ext.cardView
-    compile rootProject.ext.designCompat
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation rootProject.ext.appCompat
+    implementation rootProject.ext.cardView
+    implementation rootProject.ext.materialDesign
 
-    compile project(':coverflow')
+    implementation project(':coverflow')
 }
diff --git a/app/src/androidTest/java/me/crosswall/coverflow/demo/ApplicationTest.java b/app/src/androidTest/java/me/crosswall/coverflow/demo/ApplicationTest.java
diff --git a/app/src/main/java/me/crosswall/coverflow/demo/Linkage0PagerActivity.java b/app/src/main/java/me/crosswall/coverflow/demo/Linkage0PagerActivity.java
@@ -2,22 +2,18 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.LinkagePager;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import java.util.logging.Logger;
-
 import me.crosswall.lib.coverflow.core.CoverTransformer;
-import me.crosswall.lib.coverflow.core.LinkageCoverTransformer;
-import me.crosswall.lib.coverflow.core.LinkagePagerContainer;
 import me.crosswall.lib.coverflow.core.PagerContainer;
 
 public class Linkage0PagerActivity extends AppCompatActivity {

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/LinkagePager2Activity.java b/app/src/main/java/me/crosswall/coverflow/demo/LinkagePager2Activity.java
@@ -2,12 +2,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.view.LinkagePager;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.viewpager.widget.LinkagePager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/LinkagePagerActivity.java b/app/src/main/java/me/crosswall/coverflow/demo/LinkagePagerActivity.java
@@ -2,14 +2,13 @@
 
 import android.graphics.Color;
 
-import me.crosswall.lib.coverflow.CoverFlow;
 import me.crosswall.lib.coverflow.core.LinkageCoverTransformer;
 import me.crosswall.lib.coverflow.core.LinkagePagerContainer;
 import me.crosswall.lib.coverflow.core.PageItemClickListener;
 
-import android.support.v4.view.LinkagePager;
-import android.support.v4.view.PagerAdapter;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.LinkagePager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/Normal2Activity.java b/app/src/main/java/me/crosswall/coverflow/demo/Normal2Activity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/NormalActivity.java b/app/src/main/java/me/crosswall/coverflow/demo/NormalActivity.java
@@ -1,10 +1,10 @@
 package me.crosswall.coverflow.demo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/OverlapActivity.java b/app/src/main/java/me/crosswall/coverflow/demo/OverlapActivity.java
@@ -1,14 +1,13 @@
 package me.crosswall.coverflow.demo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import me.crosswall.lib.coverflow.CoverFlow;
 import me.crosswall.lib.coverflow.core.PagerContainer;
 

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/OverlapFragment.java b/app/src/main/java/me/crosswall/coverflow/demo/OverlapFragment.java
@@ -1,9 +1,9 @@
 package me.crosswall.coverflow.demo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/me/crosswall/coverflow/demo/view/DataDemoView.java b/app/src/main/java/me/crosswall/coverflow/demo/view/DataDemoView.java
@@ -1,7 +1,7 @@
 package me.crosswall.coverflow.demo.view;
 
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ArrayAdapter;

diff --git a/app/src/main/res/layout/activity_normal.xml b/app/src/main/res/layout/activity_normal.xml
@@ -10,7 +10,7 @@
         android:layout_height="220dp"
         android:background="?attr/colorPrimary">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
           android:id="@+id/overlap_pager"
             android:layout_width="300dp"
             android:layout_height="200dp"

diff --git a/app/src/main/res/layout/activity_normal2.xml b/app/src/main/res/layout/activity_normal2.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="180dp">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_gravity="center"/>

diff --git a/app/src/main/res/layout/activity_sync.xml b/app/src/main/res/layout/activity_sync.xml
@@ -12,14 +12,14 @@
         android:layout_width="match_parent"
         android:layout_height="180dp">
 
-        <android.support.v4.view.LinkagePager
+        <androidx.viewpager.widget.LinkagePager
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_gravity="center"/>
 
     </me.crosswall.lib.coverflow.core.LinkagePagerContainer>
 
-    <android.support.v4.view.LinkagePager
+    <androidx.viewpager.widget.LinkagePager
         android:id="@+id/pager"
         android:layout_gravity="center"
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_sync_0.xml b/app/src/main/res/layout/activity_sync_0.xml
@@ -12,14 +12,14 @@
         android:layout_width="match_parent"
         android:layout_height="180dp">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_gravity="center"/>
 
     </me.crosswall.lib.coverflow.core.PagerContainer>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_gravity="center"
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_sync_collapsing.xml b/app/src/main/res/layout/activity_sync_collapsing.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/cover_pager_height"
         android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -29,14 +29,14 @@
                 android:background="?attr/colorPrimary"
                 app:layout_behavior=".behavior.ScollBehavior">
 
-                <android.support.v4.view.LinkagePager
+                <androidx.viewpager.widget.LinkagePager
                     android:layout_width="180dp"
                     android:layout_height="180dp"
                     android:layout_gravity="center" />
 
             </me.crosswall.lib.coverflow.core.LinkagePagerContainer>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
     <LinearLayout
@@ -52,7 +52,7 @@
             android:background="?attr/colorAccent"
             android:visibility="gone" />
 
-        <android.support.v4.view.LinkagePager
+        <androidx.viewpager.widget.LinkagePager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -62,4 +62,4 @@
 
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_cover.xml b/app/src/main/res/layout/item_cover.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardview"
         android:layout_width="300dp"
         android:layout_height="160dp"
@@ -24,5 +24,5 @@
             android:scaleType="centerCrop"
             android:visibility="visible"/>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_overlap_cover.xml b/app/src/main/res/layout/item_overlap_cover.xml
@@ -5,7 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <android.support.v7.widget.CardView
+  <androidx.cardview.widget.CardView
     android:id="@+id/cardview"
     android:layout_width="300dp"
     android:layout_height="160dp"
@@ -24,5 +24,5 @@
       android:scaleType="centerCrop"
       android:visibility="visible" />
 
-  </android.support.v7.widget.CardView>
+  </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
@@ -22,12 +24,13 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-def supportVersion = "23.2.1"
+def androidxVersion = "1.0.0"
+def materialVersion = "1.0.0"
 
 ext{
-    supportV4 = "com.android.support:support-v4:${supportVersion}"
-    appCompat = "com.android.support:appcompat-v7:${supportVersion}"
-    cardView  = "com.android.support:cardview-v7:${supportVersion}"
-    designCompat  = "com.android.support:design:${supportVersion}"
+    legacySupportV4 = "androidx.legacy:legacy-support-v4:${androidxVersion}"
+    appCompat = "androidx.appcompat:appcompat:${androidxVersion}"
+    cardView  = "androidx.cardview:cardview:${androidxVersion}"
+    materialDesign  = "com.google.android.material:material:${materialVersion}"
 
 }
diff --git a/coverflow/build.gradle b/coverflow/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 2
         versionName "1.0.2"
     }
@@ -25,7 +24,7 @@ allprojects {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile rootProject.ext.supportV4
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation rootProject.ext.legacySupportV4
 }