添加kotlin配置，升级targetSDK

Author: crazyqiang

app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 //获取时间戳
 def getDate() {
@@ -8,14 +9,14 @@ def getDate() {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion App.compileSdkVersion
+    buildToolsVersion App.buildToolsVersion
     defaultConfig {
-        applicationId "org.ninetripods.mq.study"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        applicationId App.appId
+        minSdkVersion App.minSdkVersion
+        targetSdkVersion App.targetSdkVersion
+        versionCode App.versionCode
+        versionName App.versionName
         vectorDrawables.useSupportLibrary = true
         buildConfigField "boolean", "IS_SHOW_LOG", "false"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -96,10 +97,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation Deps.kotlinStdlib
+    implementation Deps.androidx_material
+    implementation Deps.androidx_appcompat
+    implementation Deps.androidx_recyclerView
+    implementation Deps.androidx_constraintLayout
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     //汉字转拼音，通讯录 https://github.com/promeG/TinyPinyin
@@ -108,5 +110,6 @@ dependencies {
     implementation 'com.github.promeg:tinypinyin:2.0.3'
     implementation 'com.github.promeg:tinypinyin-lexicons-android-cncity:2.0.3'
     api project(':lib_dialog')
+//    implementation 'com.ninetripods:lib-dialog:1.1.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }

build.gradle

@@ -1,6 +1,5 @@
 apply from: 'config.gradle'
 
-
 buildscript {
     repositories {
         maven {
@@ -14,7 +13,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath Deps.kotlinPlugin
         classpath 'com.novoda:bintray-release:0.9.1'
 //        classpath 'com.fastgo:plugin:1.0-test'
     }

buildSrc/build.gradle.kts

@@ -0,0 +1,20 @@
+repositories {
+    google()
+    jcenter()
+    mavenCentral()
+    maven {
+        url = uri("$rootDir/spi_repo")
+    }
+}
+
+allprojects {
+    repositories {
+//        mavenCentral()
+//        google()
+//        jcenter()
+    }
+}
+
+plugins {
+    `kotlin-dsl`
+}

buildSrc/src/main/java/Deps.kt

@@ -0,0 +1,50 @@
+import LibsVersion.Companion.appcompat_version
+import LibsVersion.Companion.arouter_api_version
+import LibsVersion.Companion.arouter_compiler_version
+import LibsVersion.Companion.constraintlayout_version
+import LibsVersion.Companion.kotlin_version
+import LibsVersion.Companion.material_version
+import LibsVersion.Companion.recyclerview_version
+
+/**
+ * Created by mq on 2021/8/22
+ * [email protected]
+ */
+object App {
+    const val targetSdkVersion = 30
+    const val compileSdkVersion = 30
+    const val buildToolsVersion = "30.0.0"
+    const val minSdkVersion = 19
+    const val appId = "org.ninetripods.mq.study"
+    const val versionCode = 20210506
+    const val versionName = "1.3.0"
+}
+
+object Deps {
+    //Kotlin
+    const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    const val kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+    //AndroidX相关
+    const val androidx_material = "com.google.android.material:material:$material_version"
+    const val androidx_appcompat = "androidx.appcompat:appcompat:$appcompat_version"
+    const val androidx_recyclerView = "androidx.recyclerview:recyclerview:$recyclerview_version"
+    const val androidx_constraintLayout = "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
+
+    //ARouter
+    const val arouter_api = "com.alibaba:arouter-api:$arouter_api_version"
+    const val arouter_compiler = "com.alibaba:arouter-compiler:$arouter_compiler_version"
+}
+
+internal class LibsVersion {
+
+    companion object {
+        const val kotlin_version = "1.4.32"
+        const val arouter_api_version = "1.5.1"
+        const val arouter_compiler_version = "1.5.1"
+        const val material_version = "1.2.1"
+        const val appcompat_version = "1.3.0"
+        const val recyclerview_version = "1.1.0"
+        const val constraintlayout_version = "1.1.3"
+    }
+}

config.gradle

@@ -1,8 +1,8 @@
 ext {
-    compileSdkVersion = 28
-    buildToolsVersion = '28.0.2'
+    compileSdkVersion = 30
+    buildToolsVersion = '30.0.0'
     minSdkVersion = 16
-    targetSdkVersion = 28
+    targetSdkVersion = 30
     versionCode = 3
     versionName = "1.3"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Feb 13 17:22:19 CST 2021
+#Sun Aug 22 01:02:22 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

lib_dialog/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'//添加
+//apply plugin: 'com.novoda.bintray-release'//添加
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -31,11 +31,11 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
 }
 
-publish {
-    userOrg = 'crazyqiang'//bintray.com用户名
-    groupId = 'com.ninetripods'//jCenter上的路径
-    artifactId = 'lib-dialog'//项目名称
-    publishVersion = '1.2.0'//修改版本号
-    desc = 'a common dialog library'//描述，不重要
-    website = 'https://github.com/crazyqiang/AndroidStudy/tree/master/sydialoglib'
-}
+//publish {
+//    userOrg = 'crazyqiang'//bintray.com用户名
+//    groupId = 'com.ninetripods'//jCenter上的路径
+//    artifactId = 'lib-dialog'//项目名称
+//    publishVersion = '1.2.0'//修改版本号
+//    desc = 'a common dialog library'//描述，不重要
+//    website = 'https://github.com/crazyqiang/AndroidStudy/tree/master/sydialoglib'
+//}

settings.gradle

@@ -1,4 +1,3 @@
 include ':app', ':multiprocess_sever'
 include ':lib_dialog'
-include ':plugin'
-//include ':buildSrc'
+include ':plugin'