diff --git a/build.gradle b/build.gradle index 595c3eab..17f906fc 100644 --- a/build.gradle +++ b/build.gradle @@ -2,16 +2,14 @@ buildscript { repositories { - maven { - url 'https://maven.google.com/' - name 'Google' - } - jcenter() + google() + mavenCentral() + maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath "com.android.tools.build:gradle:4.1.0" // classpath "com.novoda:bintray-release:0.9.1" - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -19,11 +17,9 @@ buildscript { allprojects { repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() + mavenCentral() + maven { url 'https://jitpack.io' } } } diff --git a/gradle.properties b/gradle.properties index 1d3591c8..210ead18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,5 @@ # 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70da1afe..b57f6193 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 14 15:15:59 CST 2019 +#Fri Jan 14 16:53:54 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/pickerview/build.gradle b/pickerview/build.gradle index 9f398512..fc6def43 100644 --- a/pickerview/build.gradle +++ b/pickerview/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' //apply plugin: 'com.novoda.bintray-release'//添加JCenter插件 @@ -46,5 +45,6 @@ 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.3.0' + implementation 'com.github.candRabbit:Android-PickerView:1.0.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..fefab257 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,10 @@ 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..8842e0ce 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,10 @@ 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..95bece9c 100644 --- a/wheelview/build.gradle +++ b/wheelview/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' //apply plugin: 'com.novoda.bintray-release'//添加插件 @@ -44,5 +43,5 @@ android { dependencies { // compile fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.3.0' } \ No newline at end of file