From f9479e9242ef284853ba01f467d402a17f7c4f2f Mon Sep 17 00:00:00 2001 From: Quyunshuo Date: Fri, 28 Aug 2020 10:38:48 +0800 Subject: [PATCH] =?UTF-8?q?Modify:=20=E5=89=94=E9=99=A4Hilt(=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BB=84=E4=BB=B6=E5=8C=96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib_Base/build.gradle | 5 ---- .../quyunshuo/base/ui/BaseFrameActivity.kt | 1 + Lib_Common/build.gradle | 4 ---- .../common/ExampleInstrumentedTest.kt | 24 ------------------- .../com/quyunshuo/common/ExampleUnitTest.kt | 17 ------------- .../src/main/java/debug/AndroidManifest.xml | 2 +- .../src/main/java/debug/MainApplication.kt | 11 +++++++++ build.gradle | 1 - .../DependencyManager.kt | 9 ------- .../ProjectPluginManager.kt | 1 - moduleBase.gradle | 6 ++--- 11 files changed, 15 insertions(+), 66 deletions(-) delete mode 100644 Lib_Common/src/androidTest/java/com/quyunshuo/common/ExampleInstrumentedTest.kt delete mode 100644 Lib_Common/src/test/java/com/quyunshuo/common/ExampleUnitTest.kt create mode 100644 Lib_Main/src/main/java/debug/MainApplication.kt diff --git a/Lib_Base/build.gradle b/Lib_Base/build.gradle index 78de0cb..f9b5a23 100644 --- a/Lib_Base/build.gradle +++ b/Lib_Base/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion BuildConfig.compileSdkVersion @@ -57,8 +56,6 @@ dependencies { api JetPack.LifecycleRuntimeKtx api JetPack.LifecycleViewModel api JetPack.LifecycleViewModelKtx - api JetPack.HiltLifecycleViewModel - api JetPack.HiltDaggerAndroid api GitHub.OkHttp api GitHub.OkHttpInterceptorLogging @@ -71,8 +68,6 @@ dependencies { api GitHub.ARoute api GitHub.RecyclerViewAdapter - kapt JetPack.HiltDaggerCompiler - kapt JetPack.Hilt kapt GitHub.GlideCompiler kapt GitHub.ARouteCompiler } \ No newline at end of file diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseFrameActivity.kt b/Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseFrameActivity.kt index e0c787f..72d4ddc 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseFrameActivity.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/ui/BaseFrameActivity.kt @@ -18,6 +18,7 @@ abstract class BaseFrameActivity : AppCompatActivity() { super.onCreate(savedInstanceState) mBinding = initViewBinding() setContentView(mBinding.root) + initView() } protected abstract fun initViewBinding(): VB diff --git a/Lib_Common/build.gradle b/Lib_Common/build.gradle index 98fda6a..df7545c 100644 --- a/Lib_Common/build.gradle +++ b/Lib_Common/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion BuildConfig.compileSdkVersion @@ -42,9 +41,6 @@ dependencies { api project(path: ':Lib_Base') - implementation JetPack.HiltDaggerAndroid - kapt JetPack.HiltDaggerCompiler - kapt JetPack.Hilt kapt GitHub.GlideCompiler kapt GitHub.ARouteCompiler } \ No newline at end of file diff --git a/Lib_Common/src/androidTest/java/com/quyunshuo/common/ExampleInstrumentedTest.kt b/Lib_Common/src/androidTest/java/com/quyunshuo/common/ExampleInstrumentedTest.kt deleted file mode 100644 index bbd6afc..0000000 --- a/Lib_Common/src/androidTest/java/com/quyunshuo/common/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.quyunshuo.common - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.quyunshuo.common.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/Lib_Common/src/test/java/com/quyunshuo/common/ExampleUnitTest.kt b/Lib_Common/src/test/java/com/quyunshuo/common/ExampleUnitTest.kt deleted file mode 100644 index ad02071..0000000 --- a/Lib_Common/src/test/java/com/quyunshuo/common/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.quyunshuo.common - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/Lib_Main/src/main/java/debug/AndroidManifest.xml b/Lib_Main/src/main/java/debug/AndroidManifest.xml index 2149fe9..dad2af9 100644 --- a/Lib_Main/src/main/java/debug/AndroidManifest.xml +++ b/Lib_Main/src/main/java/debug/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.quyunshuo.main"> diff --git a/Lib_Main/src/main/java/debug/MainApplication.kt b/Lib_Main/src/main/java/debug/MainApplication.kt new file mode 100644 index 0000000..7ef34b3 --- /dev/null +++ b/Lib_Main/src/main/java/debug/MainApplication.kt @@ -0,0 +1,11 @@ +package debug + +import com.quyunshuo.common.CommonApplication + +/** + * @Author: QuYunShuo + * @Time: 2020/8/28 + * @Class: MainApplication + * @Remark: 作为app模式时的Application + */ +class MainApplication : CommonApplication() \ No newline at end of file diff --git a/build.gradle b/build.gradle index ffa025a..34aa573 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,6 @@ buildscript { dependencies { classpath ProjectPluginManager.AndroidToolsPlugin classpath ProjectPluginManager.KotlinPlugin - classpath ProjectPluginManager.DaggerHiltPlugin } } diff --git a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt index 1ac38f8..4ee1d0e 100644 --- a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt +++ b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt @@ -25,9 +25,6 @@ object Version { const val LifecycleViewModel = "2.2.0" const val LifecycleRuntimeKtx = "2.2.0" const val LifecycleViewModelKtx = "2.2.0" - const val Hilt = "1.0.0-alpha02" // Hilt 依赖注入 - const val HiltLifecycleViewModel = "1.0.0-alpha02" - const val HiltDagger = "2.28-alpha" // GitHub---------------------------------------------------------------- const val OkHttp = "3.14.9" // OkHttp @@ -67,12 +64,6 @@ object JetPack { "androidx.lifecycle:lifecycle-runtime-ktx:${Version.LifecycleRuntimeKtx}" const val LifecycleViewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Version.LifecycleViewModelKtx}" - const val Hilt = "androidx.hilt:hilt-compiler:${Version.Hilt}" - const val HiltLifecycleViewModel = - "androidx.hilt:hilt-lifecycle-viewmodel:${Version.HiltLifecycleViewModel}" - const val HiltDaggerAndroid = "com.google.dagger:hilt-android:${Version.HiltDagger}" - const val HiltDaggerCompiler = - "com.google.dagger:hilt-android-compiler:${Version.HiltDagger}" } object Kotlin { diff --git a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/ProjectPluginManager.kt b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/ProjectPluginManager.kt index 0746836..ed74a20 100644 --- a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/ProjectPluginManager.kt +++ b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/ProjectPluginManager.kt @@ -6,5 +6,4 @@ package com.quyunshuo.androidbaseframemvvm.build object ProjectPluginManager { const val AndroidToolsPlugin = "com.android.tools.build:gradle:4.0.1" const val KotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0" - const val DaggerHiltPlugin = "com.google.dagger:hilt-android-gradle-plugin:2.28.1-alpha" } \ No newline at end of file diff --git a/moduleBase.gradle b/moduleBase.gradle index 3fc1713..80037f3 100644 --- a/moduleBase.gradle +++ b/moduleBase.gradle @@ -8,7 +8,6 @@ if (BuildConfig.isAppMode) { apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'dagger.hilt.android.plugin' android { compileSdkVersion BuildConfig.compileSdkVersion @@ -76,7 +75,6 @@ dependencies { testImplementation Android.Junit androidTestImplementation AndroidX.TestExtJunit androidTestImplementation AndroidX.TestEspresso - implementation JetPack.HiltDaggerAndroid - kapt JetPack.HiltDaggerCompiler - kapt JetPack.Hilt + kapt GitHub.GlideCompiler + kapt GitHub.ARouteCompiler } \ No newline at end of file