base/AndroidBaseFrameMVVM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: 升级 AGP、Gradle、Hilt 版本

Browse Source
This commit is contained in:
Quyunshuo
2022-05-18 23:16:27 +08:00
parent 80896bff0e
commit f0b8f7ca46
12 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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
}

3
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.quyunshuo.androidbaseframemvvm">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.INTERNET" />

1
base_module.gradle
View File

@ -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
}

4
buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt
View File

@ -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}"
}
/**

4
buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectPluginManager.kt
View File

@ -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"
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

2
lib_base/build.gradle
View File

@ -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

2
lib_base/src/main/AndroidManifest.xml
View File

@ -1 +1 @@
<manifest package="com.quyunshuo.androidbaseframemvvm.base" />
<manifest />

2
lib_common/build.gradle
View File

@ -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
}

3
lib_common/src/main/AndroidManifest.xml
View File

@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.quyunshuo.androidbaseframemvvm.common">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

1
module_home/build.gradle
View File

@ -6,4 +6,5 @@ apply from: '../base_module.gradle'
android {
resourcePrefix "home_"
namespace 'com.quyunshuo.module.home'
}

7
module_home/src/main/AndroidManifest.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.quyunshuo.module.home">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- Main 首页 -->
<activity android:name=".activity.MainActivity">
<activity
android:name=".activity.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />