gradle 升级

Author: mengxn

app/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "me.codego.example"
         minSdkVersion 14

build.gradle

@@ -2,13 +2,12 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }

dot-view/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 27
-
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 30
         versionCode 105
         versionName "1.0.5"
 
@@ -25,11 +25,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-}
-
-apply from: "https://raw.githubusercontent.com/mengxn/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
+}

dot-view/src/main/java/me/codego/view/DotLayout.java

@@ -5,8 +5,6 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
@@ -40,11 +38,11 @@ public class DotLayout extends FrameLayout {
     private static final int LOCATION_LEFT = 1;
 
 
-    public DotLayout(@NonNull Context context) {
+    public DotLayout(Context context) {
         this(context, null);
     }
 
-    public DotLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public DotLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.DotLayout, 0, 0);

dot-view/src/main/java/me/codego/view/DotView.java

@@ -8,14 +8,15 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
+import android.widget.TextView;
 
 import me.codego.dotview.R;
 
 
 /**
  * Created by mengxn on 17-3-3.
  */
-public class DotView extends android.support.v7.widget.AppCompatTextView {
+public class DotView extends TextView {
 
     private Paint mPaint;
     private int mDotPadding;
@@ -48,7 +49,7 @@ public DotView(Context context, AttributeSet attrs) {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        final int radius = getWidth()/2;
+        final int radius = getWidth() / 2;
         canvas.drawCircle(radius, radius, radius, mPaint);
         super.onDraw(canvas);
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Dec 12 20:52:08 CST 2019
+#Thu Jul 22 11:26:08 CST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-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