Merge pull request #11 from skydoves/feature/androidx

skydoves · web-flow · commit f524d9bd28e1 · 2018-11-23T11:31:19.000+09:00
Migrating to AndroidX &amp; Publish v1.0.6
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -22,8 +22,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLibrary"
-    implementation "com.android.support:design:$supportLibrary"
-    implementation "com.github.skydoves:elasticviews:2.0.0"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation "com.github.skydoves:elasticviews:2.0.1"
     implementation project(':colorpickerpreference')
 }
diff --git a/app/src/main/java/com/skydoves/colorpickerpreferencedemo/AppCompatPreferenceActivity.java b/app/src/main/java/com/skydoves/colorpickerpreferencedemo/AppCompatPreferenceActivity.java
@@ -3,11 +3,11 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/skydoves/colorpickerpreferencedemo/BaseActivity.java b/app/src/main/java/com/skydoves/colorpickerpreferencedemo/BaseActivity.java
@@ -3,10 +3,10 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/app/src/main/java/com/skydoves/colorpickerpreferencedemo/ColorPickerViewActivity.java b/app/src/main/java/com/skydoves/colorpickerpreferencedemo/ColorPickerViewActivity.java
@@ -1,7 +1,7 @@
 package com.skydoves.colorpickerpreferencedemo;
 
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/app/src/main/java/com/skydoves/colorpickerpreferencedemo/PreferenceFragment.java b/app/src/main/java/com/skydoves/colorpickerpreferencedemo/PreferenceFragment.java
@@ -3,15 +3,12 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import androidx.annotation.Nullable;
 
 import com.skydoves.colorpickerpreference.ColorEnvelope;
 import com.skydoves.colorpickerpreference.ColorListener;
 import com.skydoves.colorpickerpreference.ColorPickerDialog;
 import com.skydoves.colorpickerpreference.ColorPickerPreference;
-import com.skydoves.colorpickerpreference.ColorPickerView;
 import com.skydoves.colorpickerpreference.FlagMode;
 
 /**
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,7 @@
                 android:text="ColorPicker Example"/>
         </com.skydoves.elasticviews.ElasticLayout>
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="0.1"/>
@@ -64,7 +64,7 @@
                 android:text="ColorPickerDialog Example"/>
         </com.skydoves.elasticviews.ElasticLayout>
 
-        <android.support.v4.widget.Space
+        <androidx.legacy.widget.Space
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="0.1"/>
diff --git a/app/src/main/res/layout/layout_toolbar.xml b/app/src/main/res/layout/layout_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,4 +28,4 @@
             android:textSize="18dp"/>
     </LinearLayout>
 
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
diff --git a/build.gradle b/build.gradle
@@ -12,8 +12,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath "com.android.tools.build:gradle:3.2.1"
+        classpath "com.novoda:bintray-release:0.9"
     }
 }
 
diff --git a/colorpickerpreference/build.gradle b/colorpickerpreference/build.gradle
@@ -5,7 +5,7 @@ publish {
     userOrg = 'devmagician'
     groupId = 'com.github.skydoves'
     artifactId = 'colorpickerpreference'
-    publishVersion = '1.0.5'
+    publishVersion = '1.0.6'
     desc = 'This is ColorPickerPreference by skydoves'
     website = 'https://github.com/skydoves/ColorPickerPreference'
     issueTracker = "${website}/issues"
@@ -21,4 +21,8 @@ android {
         versionCode 1
         versionName "1.0"
     }
+}
+
+dependencies {
+    implementation "androidx.annotation:annotation:1.0.0"
 }
diff --git a/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorEnvelope.java b/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorEnvelope.java
@@ -17,6 +17,7 @@
 
 package com.skydoves.colorpickerpreference;
 
+@SuppressWarnings({"WeakerAccess", "unused"})
 public class ColorEnvelope {
     private int color;
     private String htmlCode;
diff --git a/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorPickerDialog.java b/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorPickerDialog.java
@@ -24,6 +24,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+
+@SuppressWarnings({"WeakerAccess", "unused"})
 public class ColorPickerDialog extends AlertDialog {
 
     private ColorPickerView colorPickerView;
@@ -126,15 +129,15 @@ public void setContentView(int layoutResID) {
     }
 
     @Override
-    public void setContentView(View view) {
+    public void setContentView(@NonNull View view) {
     }
 
     @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
+    public void setContentView(@NonNull View view, ViewGroup.LayoutParams params) {
     }
 
     @Override
-    public void addContentView(View view, ViewGroup.LayoutParams params) {
+    public void addContentView(@NonNull View view, ViewGroup.LayoutParams params) {
     }
 
     @Override
diff --git a/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorPickerSharedPreferencesManager.java b/colorpickerpreference/src/main/java/com/skydoves/colorpickerpreference/ColorPickerSharedPreferencesManager.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+@SuppressWarnings({"WeakerAccess", "unused"})
 public class ColorPickerSharedPreferencesManager {
 
     private SharedPreferences sharedPreferences;
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 07 22:24:00 KST 2018
+#Fri Nov 23 11:16:34 KST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ android {`
`8`	`8`	`targetSdkVersion 28`
`9`	`9`	`versionCode 1`
`10`	`10`	`versionName "1.0"`
`11`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`11`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`12`	`12`	`}`
`13`	`13`	`buildTypes {`
`14`	`14`	`release {`
`@@ -22,8 +22,8 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- implementation "com.android.support:appcompat-v7:$supportLibrary"`
`26`		`- implementation "com.android.support:design:$supportLibrary"`
`27`		`- implementation "com.github.skydoves:elasticviews:2.0.0"`
	`25`	`+ implementation 'androidx.appcompat:appcompat:1.0.2'`
	`26`	`+ implementation 'com.google.android.material:material:1.1.0-alpha01'`
	`27`	`+ implementation "com.github.skydoves:elasticviews:2.0.1"`
`28`	`28`	`implementation project(':colorpickerpreference')`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- classpath 'com.android.tools.build:gradle:3.1.4'`
`16`		`- classpath 'com.novoda:bintray-release:0.8.1'`
	`15`	`+ classpath "com.android.tools.build:gradle:3.2.1"`
	`16`	`+ classpath "com.novoda:bintray-release:0.9"`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`