diff --git a/app/build.gradle b/app/build.gradle index 3b8ded1..3e77f83 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,6 +82,7 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'com.quyunshuo.androidbaseframemvvm' } dependencies { @@ -97,5 +98,4 @@ dependencies { kapt DependencyConfig.GitHub.AutoServiceAnnotations kapt DependencyConfig.JetPack.HiltApt - kapt DependencyConfig.JetPack.HiltAndroidx } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 077c24d..737226e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/base_module.gradle b/base_module.gradle index 7602b5f..d02223a 100644 --- a/base_module.gradle +++ b/base_module.gradle @@ -96,6 +96,5 @@ dependencies { kapt DependencyConfig.GitHub.EventBusAPT kapt DependencyConfig.GitHub.AutoServiceAnnotations kapt DependencyConfig.JetPack.HiltApt - kapt DependencyConfig.JetPack.HiltAndroidx kapt DependencyConfig.JetPack.LifecycleCompilerAPT } \ No newline at end of file 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 42bb60a..4ca0843 100644 --- a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt @@ -36,8 +36,7 @@ object DependencyConfig { // JetPack--------------------------------------------------------------- const val Lifecycle = "2.3.1" // Lifecycle相关（ViewModel & LiveData & Lifecycle） - const val Hilt = "2.35.1" // DI框架-Hilt - const val HiltAndroidx = "1.0.0" + const val Hilt = "2.38.1" // DI框架-Hilt // GitHub---------------------------------------------------------------- const val OkHttp = "4.9.0" // OkHttp @@ -108,7 +107,6 @@ object DependencyConfig { "androidx.lifecycle:lifecycle-compiler:${Version.Lifecycle}" const val HiltCore = "com.google.dagger:hilt-android:${Version.Hilt}" const val HiltApt = "com.google.dagger:hilt-compiler:${Version.Hilt}" - const val HiltAndroidx = "androidx.hilt:hilt-compiler:${Version.HiltAndroidx}" } /** 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 94e8b16..a1f1743 100644 --- a/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt +++ b/buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt @@ -7,8 +7,8 @@ package com.quyunshuo.androidbaseframemvvm.buildsrc * @since 4/24/21 5:56 PM */ object ProjectPluginManager { - const val AndroidToolsPlugin = "com.android.tools.build:gradle:4.2.1" + 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 ARouterRegister = "com.alibaba:arouter-register:1.0.2" - const val HiltPlugin = "com.google.dagger:hilt-android-gradle-plugin:2.35.1" + const val HiltPlugin = "com.google.dagger:hilt-android-gradle-plugin:2.38.1" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b2f73aa..d153fba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/lib_base/build.gradle b/lib_base/build.gradle index e4bb031..fcd1031 100644 --- a/lib_base/build.gradle +++ b/lib_base/build.gradle @@ -14,6 +14,7 @@ android { } resourcePrefix "base_" + namespace 'com.quyunshuo.androidbaseframemvvm.base' } dependencies { @@ -63,7 +64,6 @@ dependencies { kapt DependencyConfig.GitHub.EventBusAPT kapt DependencyConfig.GitHub.AutoServiceAnnotations kapt DependencyConfig.JetPack.HiltApt - kapt DependencyConfig.JetPack.HiltAndroidx kapt DependencyConfig.JetPack.LifecycleCompilerAPT debugApi DependencyConfig.GitHub.LeakCanary diff --git a/lib_base/src/main/AndroidManifest.xml b/lib_base/src/main/AndroidManifest.xml index f3f3756..227314e 100644 --- a/lib_base/src/main/AndroidManifest.xml +++ b/lib_base/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/lib_common/build.gradle b/lib_common/build.gradle index c8725e8..145e452 100644 --- a/lib_common/build.gradle +++ b/lib_common/build.gradle @@ -17,6 +17,7 @@ android { } resourcePrefix "common_" + namespace 'com.quyunshuo.androidbaseframemvvm.common' } dependencies { @@ -30,6 +31,5 @@ dependencies { kapt DependencyConfig.GitHub.EventBusAPT kapt DependencyConfig.GitHub.AutoServiceAnnotations kapt DependencyConfig.JetPack.HiltApt - kapt DependencyConfig.JetPack.HiltAndroidx kapt DependencyConfig.JetPack.LifecycleCompilerAPT } \ No newline at end of file diff --git a/lib_common/src/main/AndroidManifest.xml b/lib_common/src/main/AndroidManifest.xml index dca3f02..8e326a5 100644 --- a/lib_common/src/main/AndroidManifest.xml +++ b/lib_common/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/module_home/build.gradle b/module_home/build.gradle index 45ed3a4..b9c2de4 100644 --- a/module_home/build.gradle +++ b/module_home/build.gradle @@ -6,4 +6,5 @@ apply from: '../base_module.gradle' android { resourcePrefix "home_" + namespace 'com.quyunshuo.module.home' } \ No newline at end of file diff --git a/module_home/src/main/AndroidManifest.xml b/module_home/src/main/AndroidManifest.xml index e092a89..e696e84 100644 --- a/module_home/src/main/AndroidManifest.xml +++ b/module_home/src/main/AndroidManifest.xml @@ -1,10 +1,11 @@ - + - +