From 8b3175165ed84010c18cd5b9538115309da4a4cb Mon Sep 17 00:00:00 2001 From: xionglang Date: Thu, 12 Mar 2020 10:10:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0androidx=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 ++++---- .../bigkoo/pickerviewdemo/FragmentTestActivity.java | 9 +++++---- .../com/bigkoo/pickerviewdemo/JsonDataActivity.java | 3 ++- .../java/com/bigkoo/pickerviewdemo/MainActivity.java | 3 ++- .../pickerviewdemo/TestCircleWheelViewActivity.java | 5 +++-- .../java/com/bigkoo/pickerviewdemo/TestFragment.java | 5 +++-- build.gradle | 1 + gradle.properties | 5 ++++- pickerview/build.gradle | 10 +++++----- .../pickerview/builder/OptionsPickerBuilder.java | 3 ++- .../bigkoo/pickerview/builder/TimePickerBuilder.java | 3 ++- wheelview/build.gradle | 10 +++++----- 12 files changed, 38 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b22ece5f..3ebf6aa6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 29 defaultConfig { applicationId "com.bigkoo.pickerviewdemo" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -27,6 +27,6 @@ dependencies { implementation project(':pickerview') // implementation 'com.contrarywind:Android-PickerView:4.1.9' // implementation 'com.contrarywind:wheelview:4.1.0' - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.google.code.gson:gson:2.7' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.code.gson:gson:2.8.6' } diff --git a/app/src/main/java/com/bigkoo/pickerviewdemo/FragmentTestActivity.java b/app/src/main/java/com/bigkoo/pickerviewdemo/FragmentTestActivity.java index 44e8174c..6cf31d73 100644 --- a/app/src/main/java/com/bigkoo/pickerviewdemo/FragmentTestActivity.java +++ b/app/src/main/java/com/bigkoo/pickerviewdemo/FragmentTestActivity.java @@ -2,10 +2,11 @@ import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatActivity; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; public class FragmentTestActivity extends AppCompatActivity { private FragmentManager mFragmentManager; diff --git a/app/src/main/java/com/bigkoo/pickerviewdemo/JsonDataActivity.java b/app/src/main/java/com/bigkoo/pickerviewdemo/JsonDataActivity.java index 0278233b..50ee9c29 100644 --- a/app/src/main/java/com/bigkoo/pickerviewdemo/JsonDataActivity.java +++ b/app/src/main/java/com/bigkoo/pickerviewdemo/JsonDataActivity.java @@ -5,10 +5,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.view.OptionsPickerView; diff --git a/app/src/main/java/com/bigkoo/pickerviewdemo/MainActivity.java b/app/src/main/java/com/bigkoo/pickerviewdemo/MainActivity.java index 930a6c5b..13bbd2d7 100644 --- a/app/src/main/java/com/bigkoo/pickerviewdemo/MainActivity.java +++ b/app/src/main/java/com/bigkoo/pickerviewdemo/MainActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -19,6 +18,8 @@ import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.listener.CustomListener; diff --git a/app/src/main/java/com/bigkoo/pickerviewdemo/TestCircleWheelViewActivity.java b/app/src/main/java/com/bigkoo/pickerviewdemo/TestCircleWheelViewActivity.java index 1906d93f..7ffd89ec 100644 --- a/app/src/main/java/com/bigkoo/pickerviewdemo/TestCircleWheelViewActivity.java +++ b/app/src/main/java/com/bigkoo/pickerviewdemo/TestCircleWheelViewActivity.java @@ -1,10 +1,11 @@ package com.bigkoo.pickerviewdemo; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.bigkoo.pickerview.adapter.ArrayWheelAdapter; import com.contrarywind.listener.OnItemSelectedListener; import com.contrarywind.view.WheelView; diff --git a/app/src/main/java/com/bigkoo/pickerviewdemo/TestFragment.java b/app/src/main/java/com/bigkoo/pickerviewdemo/TestFragment.java index 56b7d2a5..2aa963ef 100644 --- a/app/src/main/java/com/bigkoo/pickerviewdemo/TestFragment.java +++ b/app/src/main/java/com/bigkoo/pickerviewdemo/TestFragment.java @@ -3,8 +3,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,6 +11,9 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.listener.CustomListener; import com.bigkoo.pickerview.listener.OnTimeSelectListener; diff --git a/build.gradle b/build.gradle index 595c3eab..3c2e565f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ buildscript { allprojects { repositories { jcenter() + google() maven { url 'https://maven.google.com/' name 'Google' diff --git a/gradle.properties b/gradle.properties index 1d3591c8..65049ced 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/pickerview/build.gradle b/pickerview/build.gradle index 9f398512..6024b1a2 100644 --- a/pickerview/build.gradle +++ b/pickerview/build.gradle @@ -5,13 +5,13 @@ apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 26 + compileSdkVersion 29 defaultConfig { minSdkVersion 14 - targetSdkVersion 26 - versionCode 34 - versionName "4.1.9" + targetSdkVersion 29 + versionCode 35 + versionName "4.2.0" } buildTypes { release { @@ -46,5 +46,5 @@ dependencies { // compile fileTree(include: ['*.jar'], dir: 'libs') api project(path: ':wheelview') // api 'com.contrarywind:wheelview:4.1.0' - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.1.0' } \ No newline at end of file diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/builder/OptionsPickerBuilder.java b/pickerview/src/main/java/com/bigkoo/pickerview/builder/OptionsPickerBuilder.java index 84eaa165..8a178639 100644 --- a/pickerview/src/main/java/com/bigkoo/pickerview/builder/OptionsPickerBuilder.java +++ b/pickerview/src/main/java/com/bigkoo/pickerview/builder/OptionsPickerBuilder.java @@ -2,10 +2,11 @@ import android.content.Context; import android.graphics.Typeface; -import android.support.annotation.ColorInt; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.ColorInt; + import com.bigkoo.pickerview.configure.PickerOptions; import com.bigkoo.pickerview.listener.CustomListener; import com.bigkoo.pickerview.listener.OnOptionsSelectChangeListener; diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/builder/TimePickerBuilder.java b/pickerview/src/main/java/com/bigkoo/pickerview/builder/TimePickerBuilder.java index 9fcd75ca..21a73396 100644 --- a/pickerview/src/main/java/com/bigkoo/pickerview/builder/TimePickerBuilder.java +++ b/pickerview/src/main/java/com/bigkoo/pickerview/builder/TimePickerBuilder.java @@ -1,10 +1,11 @@ package com.bigkoo.pickerview.builder; import android.content.Context; -import android.support.annotation.ColorInt; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.ColorInt; + import com.bigkoo.pickerview.configure.PickerOptions; import com.bigkoo.pickerview.listener.CustomListener; import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener; diff --git a/wheelview/build.gradle b/wheelview/build.gradle index b90293d8..c819575c 100644 --- a/wheelview/build.gradle +++ b/wheelview/build.gradle @@ -5,13 +5,13 @@ apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 26 + compileSdkVersion 29 defaultConfig { minSdkVersion 14 - targetSdkVersion 26 - versionCode 31 - versionName "4.1.0" + targetSdkVersion 29 + versionCode 32 + versionName "4.1.1" } buildTypes { release { @@ -44,5 +44,5 @@ android { dependencies { // compile fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.1.0' } \ No newline at end of file