From a29e353d4fd6d3ebf638171124a7d476bd9a2494 Mon Sep 17 00:00:00 2001 From: Quyunshuo Date: Thu, 19 May 2022 23:30:15 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=20Kotlin=E3=80=81Je?= =?UTF-8?q?tpack=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E8=87=B3=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E3=80=81=E5=8D=87=E7=BA=A7=20compileSdkVersion=20?= =?UTF-8?q?=E4=B8=BA=2031?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 - base_lib.gradle | 1 - base_module.gradle | 1 - .../buildsrc/DependencyConfig.kt | 16 ++++++++-------- .../buildsrc/ProjectBuildConfig.kt | 5 ++--- .../buildsrc/ProjectPluginManager.kt | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e77f83..d578502 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,6 @@ apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion ProjectBuildConfig.compileSdkVersion - buildToolsVersion ProjectBuildConfig.buildToolsVersion defaultConfig { applicationId ProjectBuildConfig.applicationId diff --git a/base_lib.gradle b/base_lib.gradle index f87935f..b6e8ffb 100644 --- a/base_lib.gradle +++ b/base_lib.gradle @@ -11,7 +11,6 @@ apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion ProjectBuildConfig.compileSdkVersion - buildToolsVersion ProjectBuildConfig.buildToolsVersion defaultConfig { minSdkVersion ProjectBuildConfig.minSdkVersion diff --git a/base_module.gradle b/base_module.gradle index d02223a..e7683a4 100644 --- a/base_module.gradle +++ b/base_module.gradle @@ -16,7 +16,6 @@ apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion ProjectBuildConfig.compileSdkVersion - buildToolsVersion ProjectBuildConfig.buildToolsVersion defaultConfig { minSdkVersion ProjectBuildConfig.minSdkVersion diff --git a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt index 4ca0843..4eb279c 100644 --- a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt @@ -17,13 +17,13 @@ object DependencyConfig { object Version { // AndroidX-------------------------------------------------------------- - const val AppCompat = "1.2.0" - const val CoreKtx = "1.3.1" - const val ConstraintLayout = "2.0.1" // 约束布局 + const val AppCompat = "1.3.1" + const val CoreKtx = "1.7.0" + const val ConstraintLayout = "2.1.3" // 约束布局 const val TestExtJunit = "1.1.2" const val TestEspresso = "3.3.0" - const val ActivityKtx = "1.1.0" - const val FragmentKtx = "1.2.5" + const val ActivityKtx = "1.4.0" + const val FragmentKtx = "1.4.1" const val MultiDex = "2.0.1" // Android--------------------------------------------------------------- @@ -31,11 +31,11 @@ object DependencyConfig { const val Material = "1.2.0" // 材料设计UI套件 // Kotlin---------------------------------------------------------------- - const val Kotlin = "1.5.10" - const val Coroutines = "1.5.0" // 协程 + const val Kotlin = "1.6.21" + const val Coroutines = "1.6.1" // 协程 // JetPack--------------------------------------------------------------- - const val Lifecycle = "2.3.1" // Lifecycle相关（ViewModel & LiveData & Lifecycle） + const val Lifecycle = "2.4.1" // Lifecycle相关（ViewModel & LiveData & Lifecycle） const val Hilt = "2.38.1" // DI框架-Hilt // GitHub---------------------------------------------------------------- diff --git a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt index ba741a9..b405a93 100644 --- a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt +++ b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt @@ -7,11 +7,10 @@ package com.quyunshuo.androidbaseframemvvm.buildsrc * @since 4/24/21 5:56 PM */ object ProjectBuildConfig { - const val compileSdkVersion = 30 - const val buildToolsVersion = "30.0.1" + const val compileSdkVersion = 31 const val applicationId = "com.quyunshuo.androidbaseframemvvm" const val minSdkVersion = 21 - const val targetSdkVersion = 30 + const val targetSdkVersion = 31 const val versionCode = 1 const val versionName = "1.0" const val isAppMode = false diff --git a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt index a1f1743..37b20dd 100644 --- a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt +++ b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt @@ -8,7 +8,7 @@ package com.quyunshuo.androidbaseframemvvm.buildsrc */ object ProjectPluginManager { const val AndroidToolsPlugin = "com.android.tools.build:gradle:7.2.0" - const val KotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" + const val KotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" const val ARouterRegister = "com.alibaba:arouter-register:1.0.2" const val HiltPlugin = "com.google.dagger:hilt-android-gradle-plugin:2.38.1" } \ No newline at end of file