From e57568a5b4e1657292831474b1a18b45784111ce Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 16 Mar 2024 19:33:25 +0900 Subject: [PATCH] update dependencies. also update IDE to Android Studio Iguana | 2023.2.1 --- .idea/kotlinc.xml | 2 +- apng/build.gradle.kts | 6 +++++ app/build.gradle.kts | 2 +- base/build.gradle.kts | 2 +- .../java/jp/juggler/media/AudioTranscoder.kt | 1 + build.gradle.kts | 13 +++++++++- buildSrc/src/main/java/Vers.kt | 24 +++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 5493a6c3..4328739a 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/apng/build.gradle.kts b/apng/build.gradle.kts index be462c89..970fcec5 100644 --- a/apng/build.gradle.kts +++ b/apng/build.gradle.kts @@ -19,6 +19,12 @@ compileKotlin.kotlinOptions { "-opt-in=kotlin.ExperimentalStdlibApi", ) } +compileTestKotlin.kotlinOptions{ + jvmTarget = Vers.kotlinJvmTarget + freeCompilerArgs = listOf( + "-opt-in=kotlin.ExperimentalStdlibApi", + ) +} dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to arrayOf("*.jar")))) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1b791d4b..8ef86002 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -163,7 +163,7 @@ dependencies { implementation(project(":anko")) implementation(fileTree(mapOf("dir" to "src/main/libs", "include" to arrayOf("*.aar")))) - "fcmImplementation"("com.google.firebase:firebase-messaging:23.4.0") + "fcmImplementation"("com.google.firebase:firebase-messaging:23.4.1") "fcmImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:${Vers.kotlinxCoroutinesVersion}") implementation("androidx.core:core-splashscreen:1.0.1") diff --git a/base/build.gradle.kts b/base/build.gradle.kts index a6790d35..c38146b4 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -70,7 +70,7 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Vers.desugarLibVersion}") api("androidx.appcompat:appcompat:${Vers.appcompatVersion}") - api("androidx.browser:browser:1.7.0") + api("androidx.browser:browser:1.8.0") api("androidx.core:core-ktx:${Vers.coreKtxVersion}") api("androidx.drawerlayout:drawerlayout:1.2.0") api("androidx.emoji2:emoji2-bundled:${Vers.emoji2Version}") diff --git a/base/src/main/java/jp/juggler/media/AudioTranscoder.kt b/base/src/main/java/jp/juggler/media/AudioTranscoder.kt index aca57604..9aee92f6 100644 --- a/base/src/main/java/jp/juggler/media/AudioTranscoder.kt +++ b/base/src/main/java/jp/juggler/media/AudioTranscoder.kt @@ -49,6 +49,7 @@ fun Context.generateTempFile(prefix: String) = suspend fun transcodeAudio( context: Context, inUri: Uri, + @Suppress("UNUSED_PARAMETER") inMimeType: String, ): Pair { val inputMediaItem = MediaItem.fromUri(inUri) diff --git a/build.gradle.kts b/build.gradle.kts index 898f0a75..cf75391f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { classpath("com.android.tools.build:gradle:${Vers.androidGradlePruginVersion}") // room のバージョンの影響で google-services を上げられない場合がある - classpath("com.google.gms:google-services:4.4.0") + classpath("com.google.gms:google-services:4.4.1") //noinspection DifferentKotlinGradleVersion classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Vers.kotlinVersion}") @@ -35,6 +35,17 @@ allprojects { // alexzhirkevich/custom-qr-generator maven(url = "https://jitpack.io") } + + // configurationのリストを標準出力に出す + // usage: ./gradlew -q --no-configuration-cache :app:printConfigurations + tasks.register("printConfigurations") { + doLast { + println("project: ${project.name} configurations:") + for( c in configurations){ + println("configuration: ${c.name}") + } + } + } } tasks.withType { diff --git a/buildSrc/src/main/java/Vers.kt b/buildSrc/src/main/java/Vers.kt index b2b53b07..a1fe651f 100644 --- a/buildSrc/src/main/java/Vers.kt +++ b/buildSrc/src/main/java/Vers.kt @@ -1,6 +1,6 @@ import org.gradle.api.JavaVersion -@Suppress("MemberVisibilityCanBePrivate") +@Suppress("ConstPropertyName") object Vers { const val stBuildToolsVersion = "34.0.0" const val stCompileSdkVersion = 34 @@ -10,20 +10,25 @@ object Vers { val javaSourceCompatibility = JavaVersion.VERSION_1_8 val javaTargetCompatibility = JavaVersion.VERSION_1_8 - const val kotlinVersion = "1.9.22" + @Suppress("MemberVisibilityCanBePrivate") + const val kotlinVersion = "1.9.23" const val kotlinJvmTarget = "1.8" const val kotlinJvmToolchain = 17 - const val androidGradlePruginVersion = "8.2.1" + const val androidGradlePruginVersion = "8.3.0" const val androidxAnnotationVersion = "1.6.0" const val androidxTestEspressoCoreVersion = "3.5.1" const val androidxTestExtJunitVersion = "1.1.5" const val androidxTestVersion = "1.5.0" + @Suppress("MemberVisibilityCanBePrivate") + const val glideVersion = "4.15.1" + // const val ankoVersion = "0.10.8" const val appcompatVersion = "1.6.1" const val archVersion = "2.2.0" + const val benManesVersion = "0.51.0" const val commonsCodecVersion = "1.16.0" const val composeVersion = "1.0.5" const val conscryptVersion = "2.5.2" @@ -31,17 +36,16 @@ object Vers { const val desugarLibVersion = "2.0.4" const val detektVersion = "1.23.4" const val emoji2Version = "1.4.0" - const val glideVersion = "4.15.1" const val junitVersion = "4.13.2" const val koinVersion = "3.5.0" - const val kotlinTestVersion = kotlinVersion // "1.9.22" - const val kotlinxCoroutinesVersion = "1.7.3" + const val kotlinTestVersion = kotlinVersion + const val kotlinxCoroutinesVersion = "1.8.0" const val kotlinxSerializationPluginVersion = kotlinVersion - const val kotlinxSerializationLibVersion = "1.6.2" - const val kspVersion = "$kotlinVersion-1.0.16" - const val lifecycleVersion = "2.6.2" + const val kotlinxSerializationLibVersion = "1.6.3" + const val kspVersion = "$kotlinVersion-1.0.19" + const val lifecycleVersion = "2.7.0" const val materialVersion = "1.11.0" - const val media3Version = "1.2.0" + const val media3Version = "1.3.0" const val okhttpVersion = "5.0.0-alpha.11" const val preferenceKtxVersion = "1.2.1" const val startupVersion = "1.1.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7c64529..b564b930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Jun 13 20:53:58 JST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME