From 30514e66e52a8af341000e4f488680cf8a4407ac Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Fri, 2 Feb 2024 18:55:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 27 ++++++----- .../tieba/post/utils/PermissionUtils.kt | 4 +- .../sweet-dependency-config.yaml | 48 +++++++++++-------- 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 45ca7762..76a63683 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,10 +4,10 @@ plugins { autowire(libs.plugins.com.android.application) autowire(libs.plugins.kotlin.android) autowire(libs.plugins.kotlin.kapt) - autowire(libs.plugins.kotlin.ksp) autowire(libs.plugins.kotlin.serialization) autowire(libs.plugins.kotlin.parcelize) autowire(libs.plugins.hilt.android) + autowire(libs.plugins.kotlin.ksp) autowire(libs.plugins.com.squareup.wire) } @@ -24,6 +24,16 @@ if (!isSelfBuild && !sha.isNullOrEmpty()) { applicationVersionName += "+${sha.substring(0, 7)}" } +wire { + sourcePath { + srcDir("src/main/protos") + } + + kotlin { + android = true + } +} + android { buildToolsVersion = "34.0.0" compileSdk = 34 @@ -119,16 +129,6 @@ android { } } -wire { - sourcePath { - srcDir("src/main/protos") - } - - kotlin { - android = true - } -} - dependencies { //Local Files // implementation fileTree(include: ["*.jar"], dir: "libs") @@ -153,9 +153,9 @@ dependencies { api(wire.runtime) implementation(hilt.android) - ksp(hilt.compiler) + kapt(hilt.compiler) implementation(androidx.hilt.navigation.compose) - ksp(androidx.hilt.compiler) + kapt(androidx.hilt.compiler) implementation(accompanist.drawablepainter) implementation(accompanist.insets.ui) @@ -164,6 +164,7 @@ dependencies { implementation(sketch.core) implementation(sketch.compose) + implementation(sketch.ext.compose) implementation(sketch.gif) implementation(sketch.okhttp) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt index 60579c07..f0f13b0e 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt @@ -5,8 +5,8 @@ import android.content.Context import android.os.Build import android.os.Handler import android.os.Looper -import com.hjq.permissions.IPermissionInterceptor import com.hjq.permissions.OnPermissionCallback +import com.hjq.permissions.OnPermissionInterceptor import com.hjq.permissions.Permission import com.hjq.permissions.XXPermissions import com.huanchengfly.tieba.post.R @@ -369,7 +369,7 @@ object PermissionUtils { } class ShowPermissionTipInterceptor(val permissions: List, val description: String) : - IPermissionInterceptor { + OnPermissionInterceptor { companion object { @JvmStatic val HANDLER: Handler = Handler(Looper.getMainLooper()) diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index f7e34ac1..92963276 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -32,6 +32,13 @@ repositories: # JitPack jit-pack: +versions: + accompanist: 0.34.0 + hilt: 2.46.1 + kotlin: 1.9.22 + sketch: 3.3.0 + wire: 4.9.3 + # Configure plugins that need to be used # For example: # plugins: @@ -50,24 +57,24 @@ plugins: version: 8.2.2 org.jetbrains.kotlin.android: alias: kotlin-android - version: 1.9.22 + version-ref: kotlin org.jetbrains.kotlin.kapt: alias: kotlin-kapt - version-ref: kotlin-android + version-ref: kotlin com.google.devtools.ksp: alias: kotlin-ksp version: 1.9.22-1.0.17 org.jetbrains.kotlin.plugin.serialization: alias: kotlin-serialization - version-ref: kotlin-android + version-ref: kotlin org.jetbrains.kotlin.plugin.parcelize: alias: kotlin-parcelize - version-ref: kotlin-android + version-ref: kotlin com.google.dagger.hilt.android: alias: hilt-android - version: 2.46.1 + version-ref: hilt com.squareup.wire: - version: 4.9.5 + version-ref: wire # Configure libraries that need to be used # For example: @@ -120,7 +127,7 @@ libraries: com.squareup.wire: wire-runtime: alias: wire-runtime - version: 4.9.3 + version-ref: wire net.swiftzer.semver: semver: alias: swiftzer-semver @@ -170,10 +177,10 @@ libraries: com.google.dagger: hilt-android: alias: hilt-android - version: 2.48 + version-ref: hilt hilt-compiler: alias: hilt-compiler - version-ref: hilt-android + version-ref: hilt androidx.hilt: hilt-navigation-compose: alias: androidx-hilt-navigation-compose @@ -184,29 +191,32 @@ libraries: com.google.accompanist: accompanist-drawablepainter: alias: accompanist-drawablepainter - version: 0.34.0 + version-ref: accompanist accompanist-insets-ui: alias: accompanist-insets-ui - version-ref: accompanist-drawablepainter + version-ref: accompanist accompanist-systemuicontroller: alias: accompanist-systemuicontroller - version-ref: accompanist-drawablepainter + version-ref: accompanist accompanist-placeholder-material: alias: accompanist-placeholder-material - version-ref: accompanist-drawablepainter + version-ref: accompanist io.github.panpf.sketch3: sketch: alias: sketch-core - version: 3.3.0 + version-ref: sketch sketch-compose: alias: sketch-compose - version-ref: sketch-core + version-ref: sketch + sketch-extensions-compose: + alias: sketch-ext-compose + version-ref: sketch sketch-gif: alias: sketch-gif - version-ref: sketch-core + version-ref: sketch sketch-okhttp: alias: sketch-okhttp - version-ref: sketch-core + version-ref: sketch io.github.panpf.zoomimage: zoomimage-compose-sketch: alias: zoomimage-compose-sketch @@ -256,10 +266,10 @@ libraries: org.jetbrains.kotlin: kotlin-stdlib: alias: kotlin-stdlib - version: 1.9.22 + version-ref: kotlin kotlin-reflect: alias: kotlin-reflect - version-ref: kotlin-stdlib + version-ref: kotlin androidx.lifecycle: lifecycle-runtime-ktx: alias: androidx-lifecycle-runtime