migrated to androidx

Schibsted-Tech-Polska · Mar 25, 2022 · 7160018 · 7160018
1 parent 6390635
commit 7160018
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
   repositories {
     jcenter()
+      google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.1.0'
+    classpath 'com.android.tools.build:gradle:7.1.2'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
   repositories {
-    jcenter()
+    google()
+    maven { url "https://jitpack.io" }
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -31,3 +31,5 @@ POM_LICENCE_URL=https://github.com/futuresimple/android-floating-action-button/b
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=chalup
 POM_DEVELOPER_NAME=Jerzy Chalupski
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 22
-  buildToolsVersion "22.0.1"
+  compileSdkVersion 31
 
   defaultConfig {
     minSdkVersion 14
-    targetSdkVersion 22
+    targetSdkVersion 31
     versionName project.VERSION_NAME
     versionCode Integer.parseInt(project.VERSION_CODE)
     consumerProguardFiles 'consumer-proguard-rules.pro'
@@ -20,7 +19,5 @@ android {
 }
 
 dependencies {
-  compile 'com.android.support:support-annotations:22.2.0'
+  implementation 'androidx.annotation:annotation:1.0.0'
 }
-
-apply from: './gradle-mvn-push.gradle'
diff --git a/library/src/main/java/com/getbase/floatingactionbutton/AddFloatingActionButton.java b/library/src/main/java/com/getbase/floatingactionbutton/AddFloatingActionButton.java
@@ -8,8 +8,8 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.Shape;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
 import android.util.AttributeSet;
 
 public class AddFloatingActionButton extends FloatingActionButton {

diff --git a/library/src/main/java/com/getbase/floatingactionbutton/FloatingActionButton.java b/library/src/main/java/com/getbase/floatingactionbutton/FloatingActionButton.java
@@ -20,11 +20,11 @@
 import android.graphics.drawable.shapes.OvalShape;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.ImageButton;
 import android.widget.TextView;

diff --git a/library/src/main/java/com/getbase/floatingactionbutton/FloatingActionsMenu.java b/library/src/main/java/com/getbase/floatingactionbutton/FloatingActionsMenu.java
@@ -12,8 +12,8 @@
 import android.graphics.drawable.LayerDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.TouchDelegate;

diff --git a/library/src/main/java/com/getbase/floatingactionbutton/TouchDelegateGroup.java b/library/src/main/java/com/getbase/floatingactionbutton/TouchDelegateGroup.java
@@ -1,7 +1,7 @@
 package com.getbase.floatingactionbutton;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 22
-  buildToolsVersion "22.0.1"
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "com.getbase.floatingactionbutton.sample"
-    minSdkVersion 14
-    targetSdkVersion 22
+    minSdkVersion 23
+    targetSdkVersion 31
     versionCode 1
     versionName "1.0"
   }
@@ -21,5 +20,5 @@ android {
 }
 
 dependencies {
-  compile project(':library')
+  implementation project(':library')
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:theme="@style/Theme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>