Merge pull request #269 from yschimke/cleanup

A bunch of minor edits.

Author: joreilly

.gitignore

@@ -37,3 +37,4 @@ fastlane/report.xml
 keystore.properties
 api-*.json
 
+/.kotlin/

common/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 
 plugins {
@@ -66,9 +67,11 @@ kotlin {
         }
 
         androidMain.dependencies {
-            implementation(libs.ktor.client.android)
+            implementation(libs.ktor.client.okhttp)
+            implementation(libs.okhttp.core)
             // workaround for https://youtrack.jetbrains.com/issue/CMP-5959/Invalid-redirect-in-window-core#focus=Comments-27-10365630.0-0
             implementation("androidx.window:window-core:1.3.0")
+            implementation(libs.slf4j.android)
         }
 
         appleMain.dependencies {
@@ -116,7 +119,10 @@ multiplatformSwiftPackage {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "17"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 }
 
 kotlin.sourceSets.all {

common/src/androidMain/kotlin/dev/johnoreilly/common/di/AndroidApplicationComponent.kt

@@ -6,22 +6,18 @@ import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.johnoreilly.common.database.AppDatabase
 import dev.johnoreilly.common.database.dbFileName
-import dev.johnoreilly.common.ui.BikeShareApp
-import io.ktor.client.engine.android.Android
+import io.ktor.client.engine.okhttp.OkHttp
 import kotlinx.coroutines.Dispatchers
 import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
 import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
-
 @MergeComponent(AppScope::class)
 @SingleIn(AppScope::class)
 abstract class AndroidApplicationComponent(val application: Application): SharedApplicationComponent {
-    abstract val bikeShareApp: BikeShareApp
-
-    override fun getHttpClientEngine() = Android.create()
+    override fun httpClientEngine() = OkHttp.create()
 
-    override fun getRoomDatabase() = createRoomDatabase(application)
+    override fun appDatabase() = createRoomDatabase(application)
 
     companion object
 }

common/src/commonMain/kotlin/dev/johnoreilly/common/di/SharedApplicationComponent.kt

@@ -1,14 +1,11 @@
 package dev.johnoreilly.common.di
 
 import dev.johnoreilly.common.database.AppDatabase
-import dev.johnoreilly.common.remote.CityBikesApi
-import dev.johnoreilly.common.repository.CityBikesRepository
-import dev.johnoreilly.common.viewmodel.CountriesViewModelShared
-import dev.johnoreilly.common.viewmodel.NetworksViewModelShared
-import dev.johnoreilly.common.viewmodel.StationsViewModelShared
+import dev.johnoreilly.common.ui.BikeShareApp
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.plugins.logging.DEFAULT
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logger
@@ -18,33 +15,33 @@ import kotlinx.serialization.json.Json
 import me.tatarka.inject.annotations.Provides
 import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
 @ContributesTo(AppScope::class)
+@SingleIn(AppScope::class)
 interface SharedApplicationComponent {
-
-    val countriesViewModel: CountriesViewModelShared
-    val networksViewModel: NetworksViewModelShared
-    val stationsViewModel: StationsViewModelShared
-
-
-    val repository: CityBikesRepository
-    val cityBikesApi: CityBikesApi
-
-    val json: Json
-        @Provides get() = Json { isLenient = true; ignoreUnknownKeys = true; useAlternativeNames = false }
+    val bikeShareApp: BikeShareApp
 
     @Provides
-    fun getHttpClientEngine(): HttpClientEngine
+    fun json(): Json = Json { isLenient = true; ignoreUnknownKeys = true; useAlternativeNames = false }
 
     @Provides
-    fun getRoomDatabase(): AppDatabase
+    fun httpClientEngine(): HttpClientEngine
 
+    @Provides
+    fun appDatabase(): AppDatabase
 
     @Provides
-    fun httpClient(): HttpClient = createHttpClient(getHttpClientEngine(), json)
+    fun httpClient(httpClientEngine: HttpClientEngine, json: Json): HttpClient =
+        createHttpClient(httpClientEngine, json)
 }
 
 fun createHttpClient(httpClientEngine: HttpClientEngine, json: Json) = HttpClient(httpClientEngine) {
+    expectSuccess = true
+
+    defaultRequest {
+        url("https://api.citybik.es/")
+    }
     install(ContentNegotiation) {
         json(json)
     }

common/src/commonMain/kotlin/dev/johnoreilly/common/remote/CityBikesApi.kt

@@ -32,15 +32,13 @@ fun Station.slots(): Int {
 }
 
 @Inject
-class CityBikesApi(private val client: HttpClient,
-    private val baseUrl: String = "https://api.citybik.es/v2/networks"
-) {
+class CityBikesApi(private val client: HttpClient) {
 
     suspend fun fetchNetworkList(): NetworkListResult {
-        return client.get(baseUrl).body()
+        return client.get("/v2/networks").body()
     }
 
     suspend fun fetchBikeShareInfo(network: String): NetworkResult {
-        return client.get("$baseUrl/$network").body()
+        return client.get("/v2/networks/$network").body()
     }
 }

common/src/commonMain/kotlin/dev/johnoreilly/common/ui/BikeShareContent.kt

@@ -10,8 +10,6 @@ import com.slack.circuit.foundation.rememberCircuitNavigator
 import dev.johnoreilly.common.screens.CountryListScreen
 import me.tatarka.inject.annotations.Inject
 
-
-
 typealias BikeShareApp = @Composable () -> Unit
 
 @Inject

common/src/iosMain/kotlin/dev/johnoreilly/common/di/IosApplicationComponent.kt

@@ -4,6 +4,9 @@ import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.johnoreilly.common.database.AppDatabase
 import dev.johnoreilly.common.database.dbFileName
+import dev.johnoreilly.common.viewmodel.CountriesViewModelShared
+import dev.johnoreilly.common.viewmodel.NetworksViewModelShared
+import dev.johnoreilly.common.viewmodel.StationsViewModelShared
 import io.ktor.client.engine.darwin.Darwin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -20,9 +23,13 @@ import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 @SingleIn(AppScope::class)
 abstract class IosApplicationComponent: SharedApplicationComponent {
 
-    override fun getHttpClientEngine() = Darwin.create()
+    abstract val countriesViewModel: CountriesViewModelShared
+    abstract val networksViewModel: NetworksViewModelShared
+    abstract val stationsViewModel: StationsViewModelShared
 
-    override fun getRoomDatabase() = createRoomDatabase()
+    override fun httpClientEngine() = Darwin.create()
+
+    override fun appDatabase() = createRoomDatabase()
 }
 
 @MergeComponent.CreateComponent

common/src/jvmMain/kotlin/dev/johnoreilly/common/di/DesktopApplicationComponent.kt

@@ -4,7 +4,6 @@ import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.johnoreilly.common.database.AppDatabase
 import dev.johnoreilly.common.database.dbFileName
-import dev.johnoreilly.common.ui.BikeShareApp
 import io.ktor.client.engine.java.Java
 import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
@@ -15,11 +14,9 @@ import java.io.File
 @MergeComponent(AppScope::class)
 @SingleIn(AppScope::class)
 abstract class DesktopApplicationComponent: SharedApplicationComponent {
-  abstract val bikeShareApp: BikeShareApp
+  override fun httpClientEngine() = Java.create()
 
-  override fun getHttpClientEngine() = Java.create()
-
-  override fun getRoomDatabase() = createRoomDatabase()
+  override fun appDatabase() = createRoomDatabase()
 }
 
 fun createRoomDatabase(): AppDatabase {

compose-web/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
-
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.jetbrainsCompose)
@@ -11,6 +9,7 @@ group = "com.example"
 version = "1.0-SNAPSHOT"
 
 kotlin {
+    @Suppress("OPT_IN_USAGE")
     wasmJs {
         moduleName = "bikeshare"
         browser {
@@ -40,7 +39,3 @@ kotlin {
         }
     }
 }
-
-compose.experimental {
-    web.application {}
-}

gradle/libs.versions.toml

@@ -2,28 +2,27 @@
 kotlin = "2.1.0"
 ksp = "2.1.0-1.0.29"
 
-coroutines = "1.9.0"
-kotlinxSerialization = "1.7.3"
-
-
 androidGradlePlugin = "8.7.3"
+androidxActivity = "1.9.3"
+androidxComposeBom = "2024.12.01"
+androidxLifecycle = "2.8.7"
+androidxNavigationCompose = "2.8.5"
+androidxRoom = "2.7.0-alpha12"
 circuit = "0.24.0"
-kotlininject = "0.7.2"
+compose-multiplatform = "1.7.3"
+composeAdaptiveLayout = "1.0.0"
+coroutines = "1.9.0"
+junit = "4.13.2"
+kmpNativeCoroutines = "1.0.0-ALPHA-38"
+kmpObservableViewModel = "1.0.0-BETA-7"
 kotlin-inject-anvil = "0.1.1"
+kotlininject = "0.7.2"
+kotlinxSerialization = "1.7.3"
 ktor = "3.0.1"
+okhttp = "5.0.0-alpha.14"
 slf4j = "2.0.16"
-kmpNativeCoroutines = "1.0.0-ALPHA-38"
-kmpObservableViewModel = "1.0.0-BETA-7"
-
-compose-multiplatform = "1.7.3"
-composeAdaptiveLayout = "1.0.0"
-androidxActivity = "1.9.3"
-androidxRoom = "2.7.0-alpha12"
+slf4jAndroid = "2.0.7-0"
 sqlite = "2.5.0-alpha12"
-androidxComposeBom = "2024.12.01"
-androidxNavigationCompose = "2.8.5"
-androidxLifecycle = "2.8.7"
-junit = "4.13.2"
 
 minSdk = "24"
 targetSdk = "34"
@@ -40,50 +39,42 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
+androidx-compose-material3 =  { group = "androidx.compose.material3", name = "material3" }
+androidx-compose-material3-WindowSizeClass =  { group = "androidx.compose.material3", name="material3-window-size-class" }
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test" }
 androidx-compose-ui-test-junit = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-compose-material3 =  { group = "androidx.compose.material3", name = "material3" }
-androidx-compose-material3-WindowSizeClass =  { group = "androidx.compose.material3", name="material3-window-size-class" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigationCompose" }
 androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
-
-
-compose-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "composeAdaptiveLayout" }
-compose-adaptive-layout = { module = "org.jetbrains.compose.material3.adaptive:adaptive-layout", version.ref = "composeAdaptiveLayout" }
-
-
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigationCompose" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidxRoom" }
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidxRoom" }
-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" }
-
 circuit-foundation = { module = "com.slack.circuit:circuit-foundation", version.ref = "circuit" }
-kotlinInject-compiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlininject" }
-kotlinInject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlininject" }
-
+compose-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "composeAdaptiveLayout" }
+compose-adaptive-layout = { module = "org.jetbrains.compose.material3.adaptive:adaptive-layout", version.ref = "composeAdaptiveLayout" }
+junit = { module = "junit:junit", version.ref = "junit" }
+kmpObservableViewModel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewModel" }
 kotlinInject-anvil-compiler = { group = "software.amazon.lastmile.kotlin.inject.anvil", name = "compiler", version.ref = "kotlin-inject-anvil" }
 kotlinInject-anvil-runtime = { group = "software.amazon.lastmile.kotlin.inject.anvil", name = "runtime", version.ref = "kotlin-inject-anvil" }
 kotlinInject-anvil-runtime-optional = { group = "software.amazon.lastmile.kotlin.inject.anvil", name = "runtime-optional", version.ref = "kotlin-inject-anvil" }
-
-
+kotlinInject-compiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlininject" }
+kotlinInject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlininject" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-client-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
+ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
 ktor-client-json = { group = "io.ktor", name = "ktor-client-json", version.ref = "ktor" }
 ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
+ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
 ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization", version.ref = "ktor" }
-ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
-ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
-ktor-client-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
-ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
+okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref="okhttp" }
 slf4j = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-
-kmpObservableViewModel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewModel" }
-
-junit = { module = "junit:junit", version.ref = "junit" }
+slf4j-android = { module = "uk.uuid.slf4j:slf4j-android", version.ref = "slf4jAndroid" }
+sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" }
 
 [bundles]
 ktor-common = ["ktor-client-core", "ktor-client-json", "ktor-client-logging", "ktor-client-serialization", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]