update dependencies
This commit is contained in:
tateisu
parent
60d22d019e
commit
8efb801bc3
@ -1,7 +1,6 @@
|
||||
import io.gitlab.arturbosch.detekt.Detekt
|
||||
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.regex.Matcher
|
||||
import java.util.regex.Pattern
|
||||
|
||||
plugins {
|
||||
@ -168,7 +167,7 @@ dependencies {
|
||||
//noinspection GradleDependency
|
||||
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarLibVersion"
|
||||
|
||||
implementation(project(":base"))
|
||||
implementation project(":base")
|
||||
implementation project(":colorpicker")
|
||||
implementation project(":emoji")
|
||||
implementation project(":apng_android")
|
||||
@ -183,7 +182,7 @@ dependencies {
|
||||
implementation "com.github.UnifiedPush:android-connector:2.1.1"
|
||||
implementation "jp.wasabeef:glide-transformations:4.3.0"
|
||||
|
||||
def apng4AndroidVersion = "2.24.0"
|
||||
def apng4AndroidVersion = '2.25.0'
|
||||
implementation "com.github.penfeizhou.android.animation:apng:$apng4AndroidVersion"
|
||||
|
||||
ksp "com.github.bumptech.glide:ksp:$glideVersion"
|
||||
@ -200,11 +199,11 @@ dependencies {
|
||||
androidTestApi "androidx.test:core-ktx:$testKtxVersion"
|
||||
androidTestApi "androidx.test:core:$androidxTestVersion"
|
||||
androidTestApi "androidx.test:runner:1.5.2"
|
||||
androidTestApi "org.jetbrains.kotlin:kotlin-test"
|
||||
androidTestApi "org.jetbrains.kotlin:kotlin-test:$kotlinTestVersion"
|
||||
androidTestApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion"
|
||||
testApi "androidx.arch.core:core-testing:$archVersion"
|
||||
testApi "junit:junit:$junitVersion"
|
||||
testApi "org.jetbrains.kotlin:kotlin-test"
|
||||
testApi "org.jetbrains.kotlin:kotlin-test:$kotlinTestVersion"
|
||||
testApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion"
|
||||
|
||||
// To use android test orchestrator
|
||||
@ -231,7 +230,7 @@ repositories {
|
||||
}
|
||||
|
||||
def willApplyGoogleService() {
|
||||
Gradle gradle = getGradle()
|
||||
def gradle = getGradle()
|
||||
String taskRequestsString = gradle.getStartParameter().getTaskRequests().toString()
|
||||
|
||||
def isMatch = Pattern.compile(
|
||||
|
||||
@ -82,28 +82,29 @@ dependencies {
|
||||
api "com.github.hadilq:live-event:1.3.0"
|
||||
api "com.github.kenglxn.QRGen:android:2.5.0"
|
||||
api "com.github.omadahealth:swipy:1.2.3@aar"
|
||||
api "com.github.woxthebox:draglistview:1.6.6"
|
||||
api 'com.github.woxthebox:draglistview:1.7.3'
|
||||
api "com.google.android.exoplayer:exoplayer:$exoplayerVersion"
|
||||
api "com.google.android.flexbox:flexbox:3.0.0"
|
||||
api "com.google.android.material:material:$materialVersion"
|
||||
api "com.otaliastudios:transcoder:0.10.4"
|
||||
api 'com.otaliastudios:transcoder:0.10.5'
|
||||
api "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
|
||||
api "com.squareup.okhttp3:okhttp:$okhttpVersion"
|
||||
api "io.github.inflationx:calligraphy3:3.1.1"
|
||||
api "io.github.inflationx:viewpump:2.0.3"
|
||||
api 'io.github.inflationx:viewpump:2.1.1'
|
||||
api "org.bouncycastle:bcprov-jdk15on:1.70"
|
||||
api "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
||||
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
|
||||
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
|
||||
api "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
|
||||
api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
|
||||
api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
|
||||
api "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"
|
||||
api "androidx.media3:media3-transformer:1.0.1"
|
||||
api "androidx.media3:media3-effect:1.0.1"
|
||||
api "androidx.media3:media3-common:1.0.1"
|
||||
api 'androidx.media3:media3-transformer:1.0.2'
|
||||
api 'androidx.media3:media3-effect:1.0.2'
|
||||
api 'androidx.media3:media3-common:1.0.2'
|
||||
|
||||
// commons-codecをapiにすると、端末上の古いjarが使われてしまう
|
||||
// declaration of 'org.apache.commons.codec.binary.Base64' appears in /system/framework/org.apache.http.legacy.jar)
|
||||
androidTestImplementation "commons-codec:commons-codec:1.15"
|
||||
androidTestImplementation "commons-codec:commons-codec:$commonsCodecVersion"
|
||||
|
||||
// Koin main features for Android
|
||||
api "io.insert-koin:koin-android:$koinVersion"
|
||||
@ -113,7 +114,7 @@ dependencies {
|
||||
// api "io.insert-koin:koin-androidx-compose:$koinVersion"
|
||||
|
||||
// for com.bumptech.glide.integration.webp.*
|
||||
api "com.github.zjupure:webpdecoder:2.3.$glideVersion"
|
||||
api "com.github.zjupure:webpdecoder:$webpDecoderVersion"
|
||||
api "com.github.bumptech.glide:glide:$glideVersion"
|
||||
api "com.github.bumptech.glide:annotations:$glideVersion"
|
||||
api("com.github.bumptech.glide:okhttp3-integration:$glideVersion") {
|
||||
@ -127,11 +128,11 @@ dependencies {
|
||||
androidTestApi "androidx.test:core-ktx:$testKtxVersion"
|
||||
androidTestApi "androidx.test:core:$androidxTestVersion"
|
||||
androidTestApi "androidx.test:runner:1.5.2"
|
||||
androidTestApi "org.jetbrains.kotlin:kotlin-test"
|
||||
androidTestApi "org.jetbrains.kotlin:kotlin-test:$kotlinTestVersion"
|
||||
androidTestApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion"
|
||||
testApi "androidx.arch.core:core-testing:$archVersion"
|
||||
testApi "junit:junit:$junitVersion"
|
||||
testApi "org.jetbrains.kotlin:kotlin-test"
|
||||
testApi "org.jetbrains.kotlin:kotlin-test:$kotlinTestVersion"
|
||||
testApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion"
|
||||
|
||||
// To use android test orchestrator
|
||||
|
||||
22
build.gradle
22
build.gradle
@ -7,27 +7,31 @@ buildscript {
|
||||
ext.ankoVersion = "0.10.8"
|
||||
ext.appcompatVersion = "1.6.1"
|
||||
ext.archVersion = "2.2.0"
|
||||
|
||||
ext.commonsCodecVersion = "1.16.0"
|
||||
ext.composeVersion = "1.0.5"
|
||||
ext.conscryptVersion = "2.5.2"
|
||||
ext.conscryptVersion = "2.5.2"
|
||||
ext.coreKtxVersion = "1.10.0"
|
||||
ext.desugarLibVersion = "1.2.0"
|
||||
ext.detektVersion = "1.22.0"
|
||||
ext.coreKtxVersion = "1.10.1"
|
||||
ext.desugarLibVersion = '2.0.3'
|
||||
ext.detektVersion = '1.23.0'
|
||||
ext.emoji2Version = "1.3.0"
|
||||
ext.exoplayerVersion = "2.18.6"
|
||||
ext.glideVersion = "4.14.2"
|
||||
ext.exoplayerVersion = '2.18.7'
|
||||
ext.glideVersion = "4.15.1"
|
||||
ext.webpDecoderVersion = "2.3.$glideVersion"
|
||||
ext.javaSourceCompatibility = JavaVersion.VERSION_1_8
|
||||
ext.javaTargetCompatibility = JavaVersion.VERSION_1_8
|
||||
ext.junitVersion = "4.13.2"
|
||||
ext.koinVersion = "3.3.3"
|
||||
ext.koinVersion = '3.4.2'
|
||||
ext.kotlinJvmTarget = "1.8"
|
||||
ext.kotlinJvmToolchain = 17
|
||||
ext.kotlinVersion = "1.8.21"
|
||||
ext.kotlinxCoroutinesVersion = "1.6.4"
|
||||
ext.kotlinTestVersion = "1.8.21"
|
||||
ext.kotlinxCoroutinesVersion = '1.7.1'
|
||||
ext.kspVersion = "1.8.21-1.0.11"
|
||||
ext.lifecycleVersion = "2.6.1"
|
||||
ext.materialVersion = "1.9.0"
|
||||
ext.okhttpVersion = "4.10.0"
|
||||
ext.okhttpVersion = '5.0.0-alpha.11'
|
||||
ext.preferenceVersion = "1.2.0"
|
||||
ext.stBuildToolsVersion = "33.0.1"
|
||||
ext.stCompileSdkVersion = 33
|
||||
@ -43,7 +47,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.0.1'
|
||||
classpath 'com.android.tools.build:gradle:8.0.2'
|
||||
|
||||
// room のバージョンの影響で google-services を上げられない場合がある
|
||||
classpath "com.google.gms:google-services:4.3.15"
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Mon Jun 13 20:53:58 JST 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user