Migrate to AndroidX

kakajika · Jul 11, 2019 · 889ae82 · 889ae82
1 parent b90c92b
commit 889ae82
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.novoda:bintray-release:0.9'
-        classpath 'com.deploygate:gradle:1.1.5'
+        classpath 'com.novoda:bintray-release:0.9.1'
+        classpath 'com.deploygate:gradle:2.0.1'
     }
 }
 

diff --git a/example/build.gradle b/example/build.gradle
@@ -26,9 +26,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
@@ -38,12 +37,12 @@ dependencies {
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.41'
     repositories {
         mavenCentral()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
     }
-}
+}
diff --git a/example/src/main/java/com/labo/kaji/relativepopupwindow/example/java/ExampleActivity.java b/example/src/main/java/com/labo/kaji/relativepopupwindow/example/java/ExampleActivity.java
@@ -1,14 +1,15 @@
 package com.labo.kaji.relativepopupwindow.example.java;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.Spinner;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.labo.kaji.relativepopupwindow.RelativePopupWindow.HorizontalPosition;
 import com.labo.kaji.relativepopupwindow.RelativePopupWindow.VerticalPosition;
 
@@ -20,31 +21,31 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_example);
 
-        final Spinner spinner_vertical = (Spinner) findViewById(R.id.spinner_vertical);
+        final Spinner spinner_vertical = findViewById(R.id.spinner_vertical);
         ArrayAdapter<String> adapterVertical = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
         adapterVertical.addAll(getResources().getStringArray(R.array.vertical_positions));
         adapterVertical.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner_vertical.setAdapter(adapterVertical);
 
-        final Spinner spinner_horizontal = (Spinner) findViewById(R.id.spinner_horizontal);
+        final Spinner spinner_horizontal = findViewById(R.id.spinner_horizontal);
         ArrayAdapter<String> adapterHorizonal = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
         adapterHorizonal.addAll(getResources().getStringArray(R.array.horizontal_positions));
         adapterHorizonal.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner_horizontal.setAdapter(adapterHorizonal);
 
-        final Spinner spinner_width = (Spinner) findViewById(R.id.spinner_width);
+        final Spinner spinner_width = findViewById(R.id.spinner_width);
         ArrayAdapter<String> adapterWidth = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
         adapterWidth.addAll(getResources().getStringArray(R.array.width));
         adapterWidth.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner_width.setAdapter(adapterWidth);
 
-        final Spinner spinner_height = (Spinner) findViewById(R.id.spinner_height);
+        final Spinner spinner_height = findViewById(R.id.spinner_height);
         ArrayAdapter<String> adapterHeight = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
         adapterHeight.addAll(getResources().getStringArray(R.array.height));
         adapterHeight.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner_height.setAdapter(adapterHeight);
 
-        final CheckBox checkbox_fit_in_screen = (CheckBox) findViewById(R.id.checkbox_fit_in_screen);
+        final CheckBox checkbox_fit_in_screen = findViewById(R.id.checkbox_fit_in_screen);
 
         findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {
             @Override

diff --git a/example/src/main/java/com/labo/kaji/relativepopupwindow/example/java/ExampleCardPopup.java b/example/src/main/java/com/labo/kaji/relativepopupwindow/example/java/ExampleCardPopup.java
@@ -6,11 +6,13 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+
 import com.labo.kaji.relativepopupwindow.RelativePopupWindow;
 import com.labo.kaji.relativepopupwindow.example.R;
 
@@ -62,4 +64,4 @@ public void run() {
         });
     }
 
-}
+}
diff --git a/example/src/main/kotlin/com/labo/kaji/relativepopupwindow/example/ExampleActivity.kt b/example/src/main/kotlin/com/labo/kaji/relativepopupwindow/example/ExampleActivity.kt
@@ -1,11 +1,11 @@
 package com.labo.kaji.relativepopupwindow.example
 
 import android.os.Bundle
-import android.support.annotation.ArrayRes
-import android.support.v7.app.AppCompatActivity
 import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import androidx.annotation.ArrayRes
+import androidx.appcompat.app.AppCompatActivity
 import com.labo.kaji.relativepopupwindow.RelativePopupWindow.HorizontalPosition
 import com.labo.kaji.relativepopupwindow.RelativePopupWindow.VerticalPosition
 import kotlinx.android.synthetic.main.activity_example.*

diff --git a/example/src/main/res/layout/popup_card.xml b/example/src/main/res/layout/popup_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
@@ -28,4 +28,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/relativepopupwindow/build.gradle b/relativepopupwindow/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
         versionName "0.3.2"
@@ -21,7 +21,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'androidx.core:core:1.0.2'
 }
 
 publish {
@@ -31,4 +31,4 @@ publish {
     publishVersion = android.defaultConfig.versionName
     desc = 'Android PopupWindow that can be easily located relative to anchor View.'
     website = 'https://github.com/kakajika/RelativePopupWindow'
-}
+}
diff --git a/relativepopupwindow/src/main/java/com/labo/kaji/relativepopupwindow/RelativePopupWindow.java b/relativepopupwindow/src/main/java/com/labo/kaji/relativepopupwindow/RelativePopupWindow.java
@@ -3,15 +3,16 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.widget.PopupWindowCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.PopupWindow;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.core.widget.PopupWindowCompat;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;