Update to use androidX and target sdk 28 #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

rtsm wants to merge 1 commit into lsjwzh:master from rtsm:refactor/sdk28

app/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,13 +7,13 @@ repositories {
  
    apply plugin: 'com.android.application'

    android {

        compileSdkVersion 26

        buildToolsVersion '26.0.2'

        compileSdkVersion 28

        buildToolsVersion '28.0.2'

        defaultConfig {

            applicationId "com.lsjwzh.widget.recyclerviewpagerdeomo"

            minSdkVersion 16

            targetSdkVersion 26

            targetSdkVersion 28

            versionCode 1

            versionName "1.0"

        }

    @@ -30,15 +30,14 @@ android {
  
    }

    dependencies {

        compile fileTree(dir: 'libs', include: ['*.jar'])

        compile project(':lib')

        compile project(':tablayoutsupport')

        compile 'com.android.support:appcompat-v7:26.0.2'

        compile 'com.android.support:appcompat-v7:26.0.2'

        compile 'com.android.support:design:26.0.2'

        compile 'com.android.support:support-v4:26.0.2'

        compile 'com.android.support:support-v13:26.0.2'

        implementation fileTree(dir: 'libs', include: ['*.jar'])

        implementation project(':lib')

        implementation project(':tablayoutsupport')

        implementation 'androidx.appcompat:appcompat:1.0.0'

        implementation 'com.google.android.material:material:1.0.0'

        implementation 'androidx.legacy:legacy-support-v4:1.0.0'

        implementation 'androidx.legacy:legacy-support-v13:1.0.0'

        compile 'com.github.bumptech.glide:glide:3.7.0'

        compile 'de.hdodenhof:circleimageview:1.3.0'

        implementation 'com.github.bumptech.glide:glide:3.7.0'

        implementation 'de.hdodenhof:circleimageview:1.3.0'

    }

app/src/main/java/com/lsjwzh/adapter/GenericRecyclerViewAdapter.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,9 +6,9 @@
  
    import java.util.Collections;

    import java.util.List;

    import android.support.annotation.NonNull;

    import android.support.annotation.Nullable;

    import android.support.v7.widget.RecyclerView;

    import androidx.annotation.NonNull;

    import androidx.annotation.Nullable;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.View;

    public abstract class GenericRecyclerViewAdapter<T, VH extends RecyclerView.ViewHolder> extends

app/src/main/java/com/lsjwzh/adapter/OnRecyclerViewItemClickListener.java

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     package com.lsjwzh.adapter;
-    import android.support.v7.widget.RecyclerView;
+    import androidx.recyclerview.widget.RecyclerView;
     import android.view.View;
     public interface OnRecyclerViewItemClickListener<VH extends RecyclerView.ViewHolder> {
@@ Expand Down @@

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/CheeseListFragment.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -22,11 +22,11 @@
  
    import android.content.Context;

    import android.os.Bundle;

    import android.support.annotation.Nullable;

    import android.support.v4.app.Fragment;

    import android.support.v7.app.AppCompatActivity;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.annotation.Nullable;

    import androidx.fragment.app.Fragment;

    import androidx.appcompat.app.AppCompatActivity;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.util.Log;

    import android.util.TypedValue;

    import android.view.LayoutInflater;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/LayoutAdapter.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
     import java.util.List;
     import android.content.Context;
-    import android.support.v7.widget.RecyclerView;
+    import androidx.recyclerview.widget.RecyclerView;
     import android.view.LayoutInflater;
     import android.view.View;
     import android.view.ViewGroup;
@@ Expand Down @@

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/LoopPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,8 +2,8 @@
  
    import android.app.Activity;

    import android.os.Bundle;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.View;

    import android.widget.Button;

    import android.widget.EditText;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/MainActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,10 +18,10 @@
  
    import android.content.Intent;

    import android.os.Bundle;

    import android.support.v7.app.AppCompatActivity;

    import android.support.v7.widget.DividerItemDecoration;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.appcompat.app.AppCompatActivity;

    import androidx.recyclerview.widget.DividerItemDecoration;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.LayoutInflater;

    import android.view.View;

    import android.view.ViewGroup;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/MaterialDemoActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,12 +3,12 @@
  
    import java.util.LinkedHashMap;

    import android.os.Bundle;

    import android.support.design.widget.TabLayout;

    import android.support.v4.app.Fragment;

    import android.support.v4.app.FragmentManager;

    import android.support.v7.app.AppCompatActivity;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.Toolbar;

    import com.google.android.material.tabs.TabLayout;

    import androidx.fragment.app.Fragment;

    import androidx.fragment.app.FragmentManager;

    import androidx.appcompat.app.AppCompatActivity;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.appcompat.widget.Toolbar;

    import android.util.Log;

    import com.lsjwzh.widget.recyclerviewpager.FragmentStatePagerAdapter;

...main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/MaterialDemoWithLoopPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,12 +3,12 @@
  
    import java.util.LinkedHashMap;

    import android.os.Bundle;

    import android.support.design.widget.TabLayout;

    import android.support.v4.app.Fragment;

    import android.support.v4.app.FragmentManager;

    import android.support.v7.app.AppCompatActivity;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.Toolbar;

    import com.google.android.material.tabs.TabLayout;

    import androidx.fragment.app.Fragment;

    import androidx.fragment.app.FragmentManager;

    import androidx.appcompat.app.AppCompatActivity;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.appcompat.widget.Toolbar;

    import android.util.Log;

    import com.lsjwzh.widget.recyclerviewpager.FragmentStatePagerAdapter;

...c/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/ReverseSingleFlingPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    package com.lsjwzh.widget.recyclerviewpagerdeomo;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.util.Log;

    import android.view.View;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/ReverseVerticalPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    package com.lsjwzh.widget.recyclerviewpagerdeomo;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.View;

    import com.lsjwzh.widget.recyclerviewpager.RecyclerViewPager;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/SingleFlingPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,8 +2,8 @@
  
    import android.app.Activity;

    import android.os.Bundle;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.util.Log;

    import android.view.View;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/SpacesItemDecoration.java

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     package com.lsjwzh.widget.recyclerviewpagerdeomo;
     import android.graphics.Rect;
-    import android.support.v7.widget.RecyclerView;
+    import androidx.recyclerview.widget.RecyclerView;
     import android.view.View;
     public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
@@ Expand Down @@

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/VerticalLayoutFragment.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,9 +18,9 @@
  
    import android.app.Activity;

    import android.os.Bundle;

    import android.support.v4.app.Fragment;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.fragment.app.Fragment;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.Gravity;

    import android.view.LayoutInflater;

    import android.view.View;

app/src/main/java/com/lsjwzh/widget/recyclerviewpagerdeomo/VerticalPagerActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,8 +2,8 @@
  
    import android.app.Activity;

    import android.os.Bundle;

    import android.support.v7.widget.LinearLayoutManager;

    import android.support.v7.widget.RecyclerView;

    import androidx.recyclerview.widget.LinearLayoutManager;

    import androidx.recyclerview.widget.RecyclerView;

    import android.view.View;

    import com.lsjwzh.widget.recyclerviewpager.RecyclerViewPager;

app/src/main/res/layout/demo_list.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,9 +4,9 @@
  
                  android:layout_height="match_parent"

                  android:orientation="vertical">

      <android.support.v7.widget.RecyclerView

      <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/demo_list"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

      </android.support.v7.widget.RecyclerView>

      </androidx.recyclerview.widget.RecyclerView>

    </LinearLayout>

app/src/main/res/layout/demo_material.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,34 +1,34 @@
  
    <?xml version="1.0" encoding="utf-8"?>

    <android.support.design.widget.CoordinatorLayout

    <androidx.coordinatorlayout.widget.CoordinatorLayout

      android:id="@+id/main_content"

      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:fitsSystemWindows="true">

      <android.support.design.widget.AppBarLayout

      <com.google.android.material.appbar.AppBarLayout

        android:id="@+id/appbar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?attr/colorPrimary"

        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">

        <android.support.v7.widget.Toolbar

        <androidx.appcompat.widget.Toolbar

          android:id="@+id/toolbar"

          android:layout_width="match_parent"

          android:layout_height="?attr/actionBarSize"

          android:background="?attr/colorPrimary"

          app:layout_scrollFlags="scroll|enterAlways" />

        <android.support.design.widget.TabLayout

        <com.google.android.material.tabs.TabLayout

          android:id="@+id/tabs"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          app:tabGravity="fill"

          app:tabMode="scrollable"/>

      </android.support.design.widget.AppBarLayout>

      </com.google.android.material.appbar.AppBarLayout>

      <com.lsjwzh.widget.recyclerviewpager.RecyclerViewPager

        android:id="@+id/viewpager"

    @@ -40,4 +40,4 @@
  
        app:layout_behavior="@string/appbar_scrolling_view_behavior"

        />

    </android.support.design.widget.CoordinatorLayout>

    </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/demo_material_loop_pager.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,34 +1,34 @@
  
    <?xml version="1.0" encoding="utf-8"?>

    <android.support.design.widget.CoordinatorLayout

    <androidx.coordinatorlayout.widget.CoordinatorLayout

      android:id="@+id/main_content"

      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:fitsSystemWindows="true">

      <android.support.design.widget.AppBarLayout

      <com.google.android.material.appbar.AppBarLayout

        android:id="@+id/appbar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?attr/colorPrimary"

        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">

        <android.support.v7.widget.Toolbar

        <androidx.appcompat.widget.Toolbar

          android:id="@+id/toolbar"

          android:layout_width="match_parent"

          android:layout_height="?attr/actionBarSize"

          android:background="?attr/colorPrimary"

          app:layout_scrollFlags="scroll|enterAlways" />

        <android.support.design.widget.TabLayout

        <com.google.android.material.tabs.TabLayout

          android:id="@+id/tabs"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          app:tabGravity="fill"

          app:tabMode="scrollable"/>

      </android.support.design.widget.AppBarLayout>

      </com.google.android.material.appbar.AppBarLayout>

      <com.lsjwzh.widget.recyclerviewpager.LoopRecyclerViewPager

        android:id="@+id/viewpager"

    @@ -40,4 +40,4 @@
  
        app:layout_behavior="@string/appbar_scrolling_view_behavior"

        />

    </android.support.design.widget.CoordinatorLayout>

    </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_cheese_list.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,7 +14,7 @@
  
      ~ See the License for the specific language governing permissions and

      ~ limitations under the License.

      -->

    <android.support.v7.widget.RecyclerView android:id="@+id/recyclerview"

                                            xmlns:android="http://schemas.android.com/apk/res/android"

                                            android:layout_width="match_parent"

                                            android:layout_height="match_parent"/>

    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"

                                               xmlns:android="http://schemas.android.com/apk/res/android"

                                               android:layout_width="match_parent"

                                               android:layout_height="match_parent"/>

app/src/main/res/layout/layout_viewpager.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/viewpager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ Expand Down @@

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,10 +5,11 @@ buildscript { @@
             mavenCentral()
             maven { url "https://jitpack.io" }
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+            maven { url "http://repo.spring.io/plugins-release" }
             google()
         }
         dependencies {
-            classpath('com.android.tools.build:gradle:3.0.1')
+            classpath('com.android.tools.build:gradle:3.2.0')
             // NOTE: Do not place your application dependencies here; they belong
             // in the individual module build.gradle files
         }
@@ Expand Down @@

gradle.properties

-Original file line number
+Diff line change
@@ Expand Up @@
     POM_LICENCE_DIST=repo
     POM_DEVELOPER_ID=lsjwzh
     POM_DEVELOPER_NAME=lsjwzh
+    android.useAndroidX=true
+    android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    #Fri Apr 28 13:11:28 MSK 2017

    #Tue Sep 25 14:41:26 CEST 2018

    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-4.6-all.zip

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to use androidX and target sdk 28 #218

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Update to use androidX and target sdk 28 #218

Are you sure you want to change the base?

Uh oh!

Update to use androidX and target sdk 28 #218

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!