Merge pull request #3 from gdingenen/androidx

Androidx
mtotschnig · Dec 29, 2020 · 0827ffc · 0827ffc
2 parents 65e620a + d64df11
commit 0827ffc
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,3 +12,4 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=emilsjolander
 POM_DEVELOPER_NAME=Emil Sjolander
 POM_DEVELOPER_EMAIL=sjolander.emil@gmail.com
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 16 20:45:03 CEST 2020
+#Wed Sep 09 14:55:00 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support:customview:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.customview:customview:1.1.0'
 }
 
 android {

diff --git a/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.AbsSavedState;
+import androidx.customview.view.AbsSavedState;
 import android.util.AttributeSet;
 import android.view.View;
 import java.util.ArrayList;

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -6,8 +6,8 @@ repositories {
 
 dependencies {
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:28.0.0'
-    compile 'com.android.support:support-v4:28.0.0'
+    compile 'androidx.appcompat:appcompat:1.2.0'
+    compile 'androidx.legacy:legacy-support-v4:1.0.0'
     compile 'com.nineoldandroids:library:2.4.0'
 }
 

diff --git a/sample/res/layout/main.xml b/sample/res/layout/main.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
@@ -9,7 +9,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -25,7 +25,7 @@
                 android:fastScrollEnabled="true"
                 android:overScrollMode="never"/>
 
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <TextView
                 android:id="@+id/empty"
@@ -124,4 +124,4 @@
                 android:checked="true"/>
         </LinearLayout>
     </ScrollView>
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/sample/src/se/emilsjolander/stickylistheaders/sample/TestActivity.java b/sample/src/se/emilsjolander/stickylistheaders/sample/TestActivity.java
@@ -6,10 +6,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBarActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.legacy.app.ActionBarDrawerToggle;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -23,7 +24,7 @@
 /**
  * @author Emil Sjölander
  */
-public class TestActivity extends ActionBarActivity implements
+public class TestActivity extends AppCompatActivity implements
         AdapterView.OnItemClickListener, StickyListHeadersListView.OnHeaderClickListener,
         StickyListHeadersListView.OnStickyHeaderOffsetChangedListener,
         StickyListHeadersListView.OnStickyHeaderChangedListener {