From 05d23de0d2ac80c0a726efbaa46a13673c78a833 Mon Sep 17 00:00:00 2001 From: Masayuki Suda Date: Fri, 11 Jan 2019 16:16:11 +0900 Subject: [PATCH] Support Android X --- SwitchButton/build.gradle | 2 +- SwitchButton/demo/build.gradle | 36 ++++++++--------- .../switchbutton/demo/MainActivity.java | 2 +- .../switchbutton/demo/RecyclerActivity.java | 6 +-- .../switchbutton/demo/StyleActivity.java | 2 +- .../demo/StyleInCodeActivity.java | 2 +- .../switchbutton/demo/UseActivity.java | 2 +- .../src/main/res/layout/activity_recycler.xml | 4 +- SwitchButton/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- SwitchButton/library/build.gradle | 40 +++++++++---------- .../kyleduo/switchbutton/SwitchButton.java | 2 +- 12 files changed, 53 insertions(+), 51 deletions(-) diff --git a/SwitchButton/build.gradle b/SwitchButton/build.gradle index 9105388..ee5ddeb 100644 --- a/SwitchButton/build.gradle +++ b/SwitchButton/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } diff --git a/SwitchButton/demo/build.gradle b/SwitchButton/demo/build.gradle index fc0265e..327ffce 100644 --- a/SwitchButton/demo/build.gradle +++ b/SwitchButton/demo/build.gradle @@ -1,27 +1,27 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' - defaultConfig { - applicationId "com.kyleduo.switchbutton.demo" - minSdkVersion 14 - targetSdkVersion 26 - versionCode Integer.parseInt(VERSION_CODE) - versionName VERSION_NAME - } - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + defaultConfig { + applicationId "com.kyleduo.switchbutton.demo" + minSdkVersion 14 + targetSdkVersion 28 + versionCode Integer.parseInt(VERSION_CODE) + versionName VERSION_NAME + } + buildTypes { + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation project(':library') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' + implementation project(':library') } diff --git a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/MainActivity.java b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/MainActivity.java index 29c4487..c2b4a89 100644 --- a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/MainActivity.java +++ b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/MainActivity.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/RecyclerActivity.java b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/RecyclerActivity.java index 556f99a..d4f7d8f 100644 --- a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/RecyclerActivity.java +++ b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/RecyclerActivity.java @@ -1,9 +1,9 @@ package com.kyleduo.switchbutton.demo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleActivity.java b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleActivity.java index 4b87f73..fce1ab5 100644 --- a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleActivity.java +++ b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleActivity.java @@ -1,7 +1,7 @@ package com.kyleduo.switchbutton.demo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.CompoundButton; import com.kyleduo.switchbutton.SwitchButton; diff --git a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleInCodeActivity.java b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleInCodeActivity.java index d8bb2b3..f4899eb 100644 --- a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleInCodeActivity.java +++ b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/StyleInCodeActivity.java @@ -2,7 +2,7 @@ import android.graphics.RectF; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/UseActivity.java b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/UseActivity.java index 80024aa..39ac55f 100644 --- a/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/UseActivity.java +++ b/SwitchButton/demo/src/main/java/com/kyleduo/switchbutton/demo/UseActivity.java @@ -3,7 +3,7 @@ import android.animation.Animator; import android.animation.ObjectAnimator; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.CompoundButton; diff --git a/SwitchButton/demo/src/main/res/layout/activity_recycler.xml b/SwitchButton/demo/src/main/res/layout/activity_recycler.xml index 79f7f53..af4a141 100644 --- a/SwitchButton/demo/src/main/res/layout/activity_recycler.xml +++ b/SwitchButton/demo/src/main/res/layout/activity_recycler.xml @@ -1,8 +1,8 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/SwitchButton/gradle.properties b/SwitchButton/gradle.properties index b9878e7..7ae248f 100644 --- a/SwitchButton/gradle.properties +++ b/SwitchButton/gradle.properties @@ -24,4 +24,6 @@ GROUP=com.kyleduo.switchbutton DESC=A switch widget, clean and easy to use. DEVELOPER_ID=kyleduo DEVELOPER_NAME=kyleduo -DEVELOPER_EMAIL=kyleduo@gmail.com \ No newline at end of file +DEVELOPER_EMAIL=kyleduo@gmail.com +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/SwitchButton/gradle/wrapper/gradle-wrapper.properties b/SwitchButton/gradle/wrapper/gradle-wrapper.properties index 314508c..a8fadf5 100644 --- a/SwitchButton/gradle/wrapper/gradle-wrapper.properties +++ b/SwitchButton/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-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/SwitchButton/library/build.gradle b/SwitchButton/library/build.gradle index d882776..01bed24 100644 --- a/SwitchButton/library/build.gradle +++ b/SwitchButton/library/build.gradle @@ -1,34 +1,34 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '26.0.2' - resourcePrefix "ksw" + compileSdkVersion 28 + buildToolsVersion '28.0.3' + resourcePrefix "ksw" - defaultConfig { - minSdkVersion 11 - targetSdkVersion 23 - versionCode Integer.parseInt(VERSION_CODE) - versionName VERSION_NAME - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + defaultConfig { + minSdkVersion 14 + targetSdkVersion 28 + versionCode Integer.parseInt(VERSION_CODE) + versionName VERSION_NAME + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - //noinspection GradleDependency - implementation 'com.android.support:appcompat-v7:23.1.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + //noinspection GradleDependency + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' } ext { - POM_ARTIFACT_ID = 'library' - POM_NAME = 'SwitchButton' - POM_PACKAGING = 'aar' + POM_ARTIFACT_ID = 'library' + POM_NAME = 'SwitchButton' + POM_PACKAGING = 'aar' } apply from: rootProject.file('gradle/gradle-bintray-upload.gradle') \ No newline at end of file diff --git a/SwitchButton/library/src/main/java/com/kyleduo/switchbutton/SwitchButton.java b/SwitchButton/library/src/main/java/com/kyleduo/switchbutton/SwitchButton.java index 5f169c2..8119d58 100644 --- a/SwitchButton/library/src/main/java/com/kyleduo/switchbutton/SwitchButton.java +++ b/SwitchButton/library/src/main/java/com/kyleduo/switchbutton/SwitchButton.java @@ -15,7 +15,7 @@ import android.graphics.drawable.StateListDrawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint;