From 2594cb74f0978c0cb26b95222dd550d0b1232e44 Mon Sep 17 00:00:00 2001 From: zxy_it Date: Wed, 15 Jun 2022 11:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 15 +++++++-------- build.gradle | 3 +-- config.gradle | 28 ++++------------------------ library/build.gradle | 34 +++++++++++++++++----------------- 4 files changed, 29 insertions(+), 51 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1e88257..105afca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -112,10 +112,10 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '11' - useIR = true - } +// kotlinOptions { +// jvmTarget = '11' +// useIR = true +// } } configurations.all { @@ -149,11 +149,10 @@ dependencies { } // Kotlin中使用了Glide注解 - kapt dependencies.glideCompiler + kapt 'com.github.bumptech.glide:compiler:4.12.0' // 路由 - kapt dependencies.arouterCompiler + kapt 'com.alibaba:arouter-compiler:1.5.2' // 依赖注入 -// implementation dependencies.hilt -// kapt dependencies.hiltCompiler + kapt 'com.google.dagger:hilt-android-compiler:2.42' } diff --git a/build.gradle b/build.gradle index 1922ebe..3068881 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.1.3' // kotlin - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0" // 事件总线 classpath 'com.blankj:bus-gradle-plugin:2.6' @@ -69,4 +69,3 @@ def useLocalDependencies() { static def getDate() { return new Date().format("yyyyMMdd HH-mm-ss", TimeZone.getTimeZone("UTC")) } - diff --git a/config.gradle b/config.gradle index e3465f8..7ea9462 100644 --- a/config.gradle +++ b/config.gradle @@ -11,35 +11,15 @@ ext { appCode : 100, appName : "1.0.0", - commonCode : 100, - commonName : "1.0.0", - - functionCode : 100, - functionName : "1.0.0", - - utilsCode : 100, - utilsName : "1.0.0", - - viewCode : 100, - viewName : "1.0.0", - - libraryCode : 1130, - libraryName : "1.1.30", + libraryCode : 1143, + libraryName : "1.1.43", libraryGroupId : "com.gitee.zxy_it", libraryArtifactId: "BaseLibrary", ] // 第三方库版本号 dependencies = [ - BaseLibrary : "com.gitee.zxy_it:BaseLibrary:1.1.39", - - // Kotlin中使用了Glide注解 - glideCompiler : 'com.github.bumptech.glide:compiler:4.12.0', - // 路由 - arouterCompiler: 'com.alibaba:arouter-compiler:1.5.2', - // 依赖注入 - hilt : "com.google.dagger:hilt-android:2.28-alpha", - hiltCompiler : "com.google.dagger:hilt-android-compiler:2.28-alpha", - +// hilt : "com.google.dagger:hilt-android:2.28-alpha", +// hiltCompiler : "com.google.dagger:hilt-android-compiler:2.28-alpha", ] } diff --git a/library/build.gradle b/library/build.gradle index 43b9100..be91b1c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -91,10 +91,10 @@ android { targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '11' - useIR = true - } +// kotlinOptions { +// jvmTarget = '11' +// useIR = true +// } } @@ -113,7 +113,7 @@ dependencies { // 多 dex api 'androidx.multidex:multidex:2.0.1' // design - api 'com.google.android.material:material:1.4.0' + api 'com.google.android.material:material:1.6.1' // 矢量 api 'androidx.vectordrawable:vectordrawable:1.1.0' api "androidx.vectordrawable:vectordrawable-seekable:1.0.0-alpha02" @@ -143,18 +143,18 @@ dependencies { api "androidx.annotation:annotation:1.4.0-alpha02" // 生命周期管理相关 - api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0-beta01" + api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0-rc01" api "androidx.lifecycle:lifecycle-livedata-ktx:2.5.0-beta01" api "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-beta01" - api "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-beta01" + api "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01" // kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" // 不使用compiler注解,使用java8,直接实现这个接口即可DefaultLifecycleObserver - api "androidx.lifecycle:lifecycle-common-java8:2.5.0-beta01" + api "androidx.lifecycle:lifecycle-common-java8:2.5.0-rc01" api "androidx.lifecycle:lifecycle-service:2.5.0-beta01" api "androidx.lifecycle:lifecycle-process:2.5.0-beta01" // 依赖注入 - implementation dependencies.hilt - kapt dependencies.hiltCompiler + implementation 'com.google.dagger:hilt-android:2.42' + kapt 'com.google.dagger:hilt-android-compiler:2.42' // sqlite 数据库 api 'org.litepal.guolindev:core:3.2.3' @@ -192,7 +192,7 @@ dependencies { // 图片 api 'com.github.bumptech.glide:glide:4.13.2' // Kotlin中使用了Glide注解 - kapt dependencies.glideCompiler + kapt 'com.github.bumptech.glide:compiler:4.12.0' api 'com.github.bumptech.glide:okhttp3-integration:4.11.0' api 'jp.wasabeef:glide-transformations:4.3.0' api 'jp.co.cyberagent.android:gpuimage:2.1.0' @@ -265,18 +265,18 @@ dependencies { // 混淆库 api 'com.github.zhaoxiuyu:Proguards:1.0.5' - // 路由 - api 'com.alibaba:arouter-api:1.5.2' - kapt dependencies.arouterCompiler - - //字节跳动启动优化 + // 字节跳动启动优化 api 'com.bytedance.boost_multidex:boost_multidex:1.0.1' api 'me.weishu:free_reflection:3.0.1' - //三角角标控件 + // 三角角标控件 api 'com.github.xiaoliang0227:TriangleView:1.0.3' + // 路由 + api 'com.alibaba:arouter-api:1.5.2' + kapt 'com.alibaba:arouter-compiler:1.5.2' + // ViewBindingKTX api 'com.github.DylanCaiCoding.ViewBindingKTX:viewbinding-ktx:2.0.5' api 'com.github.DylanCaiCoding.ViewBindingKTX:viewbinding-nonreflection-ktx:2.0.5'