fix: 构建失败
This commit is contained in:
parent
625a9b9ff8
commit
30514e66e5
|
|
@ -4,10 +4,10 @@ plugins {
|
||||||
autowire(libs.plugins.com.android.application)
|
autowire(libs.plugins.com.android.application)
|
||||||
autowire(libs.plugins.kotlin.android)
|
autowire(libs.plugins.kotlin.android)
|
||||||
autowire(libs.plugins.kotlin.kapt)
|
autowire(libs.plugins.kotlin.kapt)
|
||||||
autowire(libs.plugins.kotlin.ksp)
|
|
||||||
autowire(libs.plugins.kotlin.serialization)
|
autowire(libs.plugins.kotlin.serialization)
|
||||||
autowire(libs.plugins.kotlin.parcelize)
|
autowire(libs.plugins.kotlin.parcelize)
|
||||||
autowire(libs.plugins.hilt.android)
|
autowire(libs.plugins.hilt.android)
|
||||||
|
autowire(libs.plugins.kotlin.ksp)
|
||||||
autowire(libs.plugins.com.squareup.wire)
|
autowire(libs.plugins.com.squareup.wire)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -24,6 +24,16 @@ if (!isSelfBuild && !sha.isNullOrEmpty()) {
|
||||||
applicationVersionName += "+${sha.substring(0, 7)}"
|
applicationVersionName += "+${sha.substring(0, 7)}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wire {
|
||||||
|
sourcePath {
|
||||||
|
srcDir("src/main/protos")
|
||||||
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
android = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
buildToolsVersion = "34.0.0"
|
buildToolsVersion = "34.0.0"
|
||||||
compileSdk = 34
|
compileSdk = 34
|
||||||
|
|
@ -119,16 +129,6 @@ android {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wire {
|
|
||||||
sourcePath {
|
|
||||||
srcDir("src/main/protos")
|
|
||||||
}
|
|
||||||
|
|
||||||
kotlin {
|
|
||||||
android = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
//Local Files
|
//Local Files
|
||||||
// implementation fileTree(include: ["*.jar"], dir: "libs")
|
// implementation fileTree(include: ["*.jar"], dir: "libs")
|
||||||
|
|
@ -153,9 +153,9 @@ dependencies {
|
||||||
api(wire.runtime)
|
api(wire.runtime)
|
||||||
|
|
||||||
implementation(hilt.android)
|
implementation(hilt.android)
|
||||||
ksp(hilt.compiler)
|
kapt(hilt.compiler)
|
||||||
implementation(androidx.hilt.navigation.compose)
|
implementation(androidx.hilt.navigation.compose)
|
||||||
ksp(androidx.hilt.compiler)
|
kapt(androidx.hilt.compiler)
|
||||||
|
|
||||||
implementation(accompanist.drawablepainter)
|
implementation(accompanist.drawablepainter)
|
||||||
implementation(accompanist.insets.ui)
|
implementation(accompanist.insets.ui)
|
||||||
|
|
@ -164,6 +164,7 @@ dependencies {
|
||||||
|
|
||||||
implementation(sketch.core)
|
implementation(sketch.core)
|
||||||
implementation(sketch.compose)
|
implementation(sketch.compose)
|
||||||
|
implementation(sketch.ext.compose)
|
||||||
implementation(sketch.gif)
|
implementation(sketch.gif)
|
||||||
implementation(sketch.okhttp)
|
implementation(sketch.okhttp)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@ import android.content.Context
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import com.hjq.permissions.IPermissionInterceptor
|
|
||||||
import com.hjq.permissions.OnPermissionCallback
|
import com.hjq.permissions.OnPermissionCallback
|
||||||
|
import com.hjq.permissions.OnPermissionInterceptor
|
||||||
import com.hjq.permissions.Permission
|
import com.hjq.permissions.Permission
|
||||||
import com.hjq.permissions.XXPermissions
|
import com.hjq.permissions.XXPermissions
|
||||||
import com.huanchengfly.tieba.post.R
|
import com.huanchengfly.tieba.post.R
|
||||||
|
|
@ -369,7 +369,7 @@ object PermissionUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
class ShowPermissionTipInterceptor(val permissions: List<String>, val description: String) :
|
class ShowPermissionTipInterceptor(val permissions: List<String>, val description: String) :
|
||||||
IPermissionInterceptor {
|
OnPermissionInterceptor {
|
||||||
companion object {
|
companion object {
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
val HANDLER: Handler = Handler(Looper.getMainLooper())
|
val HANDLER: Handler = Handler(Looper.getMainLooper())
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,13 @@ repositories:
|
||||||
# JitPack
|
# JitPack
|
||||||
jit-pack:
|
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
|
# Configure plugins that need to be used
|
||||||
# For example:
|
# For example:
|
||||||
# plugins:
|
# plugins:
|
||||||
|
|
@ -50,24 +57,24 @@ plugins:
|
||||||
version: 8.2.2
|
version: 8.2.2
|
||||||
org.jetbrains.kotlin.android:
|
org.jetbrains.kotlin.android:
|
||||||
alias: kotlin-android
|
alias: kotlin-android
|
||||||
version: 1.9.22
|
version-ref: kotlin
|
||||||
org.jetbrains.kotlin.kapt:
|
org.jetbrains.kotlin.kapt:
|
||||||
alias: kotlin-kapt
|
alias: kotlin-kapt
|
||||||
version-ref: kotlin-android
|
version-ref: kotlin
|
||||||
com.google.devtools.ksp:
|
com.google.devtools.ksp:
|
||||||
alias: kotlin-ksp
|
alias: kotlin-ksp
|
||||||
version: 1.9.22-1.0.17
|
version: 1.9.22-1.0.17
|
||||||
org.jetbrains.kotlin.plugin.serialization:
|
org.jetbrains.kotlin.plugin.serialization:
|
||||||
alias: kotlin-serialization
|
alias: kotlin-serialization
|
||||||
version-ref: kotlin-android
|
version-ref: kotlin
|
||||||
org.jetbrains.kotlin.plugin.parcelize:
|
org.jetbrains.kotlin.plugin.parcelize:
|
||||||
alias: kotlin-parcelize
|
alias: kotlin-parcelize
|
||||||
version-ref: kotlin-android
|
version-ref: kotlin
|
||||||
com.google.dagger.hilt.android:
|
com.google.dagger.hilt.android:
|
||||||
alias: hilt-android
|
alias: hilt-android
|
||||||
version: 2.46.1
|
version-ref: hilt
|
||||||
com.squareup.wire:
|
com.squareup.wire:
|
||||||
version: 4.9.5
|
version-ref: wire
|
||||||
|
|
||||||
# Configure libraries that need to be used
|
# Configure libraries that need to be used
|
||||||
# For example:
|
# For example:
|
||||||
|
|
@ -120,7 +127,7 @@ libraries:
|
||||||
com.squareup.wire:
|
com.squareup.wire:
|
||||||
wire-runtime:
|
wire-runtime:
|
||||||
alias: wire-runtime
|
alias: wire-runtime
|
||||||
version: 4.9.3
|
version-ref: wire
|
||||||
net.swiftzer.semver:
|
net.swiftzer.semver:
|
||||||
semver:
|
semver:
|
||||||
alias: swiftzer-semver
|
alias: swiftzer-semver
|
||||||
|
|
@ -170,10 +177,10 @@ libraries:
|
||||||
com.google.dagger:
|
com.google.dagger:
|
||||||
hilt-android:
|
hilt-android:
|
||||||
alias: hilt-android
|
alias: hilt-android
|
||||||
version: 2.48
|
version-ref: hilt
|
||||||
hilt-compiler:
|
hilt-compiler:
|
||||||
alias: hilt-compiler
|
alias: hilt-compiler
|
||||||
version-ref: hilt-android
|
version-ref: hilt
|
||||||
androidx.hilt:
|
androidx.hilt:
|
||||||
hilt-navigation-compose:
|
hilt-navigation-compose:
|
||||||
alias: androidx-hilt-navigation-compose
|
alias: androidx-hilt-navigation-compose
|
||||||
|
|
@ -184,29 +191,32 @@ libraries:
|
||||||
com.google.accompanist:
|
com.google.accompanist:
|
||||||
accompanist-drawablepainter:
|
accompanist-drawablepainter:
|
||||||
alias: accompanist-drawablepainter
|
alias: accompanist-drawablepainter
|
||||||
version: 0.34.0
|
version-ref: accompanist
|
||||||
accompanist-insets-ui:
|
accompanist-insets-ui:
|
||||||
alias: accompanist-insets-ui
|
alias: accompanist-insets-ui
|
||||||
version-ref: accompanist-drawablepainter
|
version-ref: accompanist
|
||||||
accompanist-systemuicontroller:
|
accompanist-systemuicontroller:
|
||||||
alias: accompanist-systemuicontroller
|
alias: accompanist-systemuicontroller
|
||||||
version-ref: accompanist-drawablepainter
|
version-ref: accompanist
|
||||||
accompanist-placeholder-material:
|
accompanist-placeholder-material:
|
||||||
alias: accompanist-placeholder-material
|
alias: accompanist-placeholder-material
|
||||||
version-ref: accompanist-drawablepainter
|
version-ref: accompanist
|
||||||
io.github.panpf.sketch3:
|
io.github.panpf.sketch3:
|
||||||
sketch:
|
sketch:
|
||||||
alias: sketch-core
|
alias: sketch-core
|
||||||
version: 3.3.0
|
version-ref: sketch
|
||||||
sketch-compose:
|
sketch-compose:
|
||||||
alias: sketch-compose
|
alias: sketch-compose
|
||||||
version-ref: sketch-core
|
version-ref: sketch
|
||||||
|
sketch-extensions-compose:
|
||||||
|
alias: sketch-ext-compose
|
||||||
|
version-ref: sketch
|
||||||
sketch-gif:
|
sketch-gif:
|
||||||
alias: sketch-gif
|
alias: sketch-gif
|
||||||
version-ref: sketch-core
|
version-ref: sketch
|
||||||
sketch-okhttp:
|
sketch-okhttp:
|
||||||
alias: sketch-okhttp
|
alias: sketch-okhttp
|
||||||
version-ref: sketch-core
|
version-ref: sketch
|
||||||
io.github.panpf.zoomimage:
|
io.github.panpf.zoomimage:
|
||||||
zoomimage-compose-sketch:
|
zoomimage-compose-sketch:
|
||||||
alias: zoomimage-compose-sketch
|
alias: zoomimage-compose-sketch
|
||||||
|
|
@ -256,10 +266,10 @@ libraries:
|
||||||
org.jetbrains.kotlin:
|
org.jetbrains.kotlin:
|
||||||
kotlin-stdlib:
|
kotlin-stdlib:
|
||||||
alias: kotlin-stdlib
|
alias: kotlin-stdlib
|
||||||
version: 1.9.22
|
version-ref: kotlin
|
||||||
kotlin-reflect:
|
kotlin-reflect:
|
||||||
alias: kotlin-reflect
|
alias: kotlin-reflect
|
||||||
version-ref: kotlin-stdlib
|
version-ref: kotlin
|
||||||
androidx.lifecycle:
|
androidx.lifecycle:
|
||||||
lifecycle-runtime-ktx:
|
lifecycle-runtime-ktx:
|
||||||
alias: androidx-lifecycle-runtime
|
alias: androidx-lifecycle-runtime
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue