Merge branch 'main' into fix/#1237-achievements-image-size-issue

DroidKaigi · Sep 16, 2023 · 4fe9e1f · 4fe9e1f
2 parents f1721b8 + a7ca390
commit 4fe9e1f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/AppModule.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/AppModule.kt
@@ -19,4 +19,5 @@ class AppModule {
 
 class AppBuildConfigProvider(
     override val versionName: String = BuildConfig.VERSION_NAME,
+    override val debugBuild: Boolean = BuildConfig.DEBUG,
 ) : BuildConfigProvider
diff --git a/core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/ApiModule.kt b/core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/ApiModule.kt
@@ -18,6 +18,7 @@ import io.github.droidkaigi.confsched2023.data.di.ServerEnvironmentModule.Server
 import io.github.droidkaigi.confsched2023.data.remoteconfig.DefaultRemoteConfigApi
 import io.github.droidkaigi.confsched2023.data.remoteconfig.RemoteConfigApi
 import io.github.droidkaigi.confsched2023.data.user.UserDataStore
+import io.github.droidkaigi.confsched2023.model.BuildConfigProvider
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
 import kotlinx.serialization.json.Json
@@ -44,15 +45,15 @@ public class ApiModule {
         okHttpClient: OkHttpClient,
         settingsDatastore: UserDataStore,
         ktorJsonSettings: Json,
+        buildConfigProvider: BuildConfigProvider,
     ): HttpClient {
         val httpClient = HttpClient(OkHttp) {
             engine {
                 config {
                     preconfigured = okHttpClient
                     addInterceptor(
                         HttpLoggingInterceptor().apply {
-                            // TODO use BuildConfig.DEBUG
-                            level = if (true) {
+                            level = if (buildConfigProvider.debugBuild) {
                                 HttpLoggingInterceptor.Level.BODY
                             } else {
                                 HttpLoggingInterceptor.Level.NONE

diff --git a/...ndroidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/BuildConfigProviderModule.kt b/...ndroidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/BuildConfigProviderModule.kt
@@ -37,4 +37,5 @@ abstract class AppAndroidBuildConfigModule {
 
 private object EmptyBuildConfigProvider : BuildConfigProvider {
     override val versionName: String = ""
+    override val debugBuild: Boolean = false
 }
diff --git a/...del/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/BuildConfigProvider.kt b/...del/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/BuildConfigProvider.kt
@@ -2,4 +2,5 @@ package io.github.droidkaigi.confsched2023.model
 
 interface BuildConfigProvider {
     val versionName: String
+    val debugBuild: Boolean
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidGradlePlugin = "8.1.1"
 # https://developer.android.com/jetpack/androidx/releases/compose-kotlin?#pre-release_kotlin_compatibility
 kotlin = "1.9.0"
 
-androidxCore = "1.10.1"
+androidxCore = "1.12.0"
 androidDesugarJdkLibs = "2.0.3"
 compose = "2023.09.00"
 composeCompiler = "1.5.2"