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 index 4cef11e65..06b477e0d 100644 --- 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 index 74ef3ad6e..1b379d83c 100644 --- 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,6 +45,7 @@ public class ApiModule { okHttpClient: OkHttpClient, settingsDatastore: UserDataStore, ktorJsonSettings: Json, + buildConfigProvider: BuildConfigProvider, ): HttpClient { val httpClient = HttpClient(OkHttp) { engine { @@ -51,8 +53,7 @@ public class ApiModule { 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/core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/BuildConfigProviderModule.kt b/core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/BuildConfigProviderModule.kt index e2e243734..7bed2e851 100644 --- a/core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched2023/data/di/BuildConfigProviderModule.kt +++ b/core/data/src/androidMain/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/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/BuildConfigProvider.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/BuildConfigProvider.kt index 63ac07756..83cc50acd 100644 --- a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/BuildConfigProvider.kt +++ b/core/model/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 index 582e6e195..9b766920d 100644 --- 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"