dependency updates

joreilly · Mar 3, 2024 · 8c6a8bf · 8c6a8bf
1 parent d9f6670
commit 8c6a8bf
Show file tree

Hide file tree

Showing 10 changed files with 308 additions and 131 deletions.
diff --git a/SharedCode/build.gradle.kts b/SharedCode/build.gradle.kts
@@ -15,10 +15,10 @@ version = "1.0"
 
 
 android {
-    compileSdk = AndroidSdk.compile
+    compileSdk = libs.versions.compileSdk.get().toInt()
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdk = AndroidSdk.min
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -50,65 +50,48 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                with(Deps.Kotlinx) {
-                    implementation(Deps.Kotlinx.coroutinesCore)
-                    implementation(serializationCore)
-                    implementation(dateTime)
-                }
-
-                with(Deps.Ktor) {
-                    implementation(clientCore)
-                    implementation(clientJson)
-                    implementation(clientLogging)
-                    implementation(contentNegotiation)
-                    implementation(json)
-                }
-
-                with(Deps.SqlDelight) {
-                    implementation(runtime)
-                    implementation(coroutineExtensions)
-                }
-
-                with(Deps.Koin) {
-                    api(core)
-                    api(test)
-                }
-
-                with(Deps.Log) {
-                    api(kermit)
-                }
-
-                api(Deps.multiplatformSettings)
-                api(Deps.multiplatformSettingsCoroutines)
+                implementation(libs.bundles.ktor.common)
+                implementation(libs.kotlinx.coroutines)
+                implementation(libs.kotlinx.serialization)
+                implementation(libs.kotlinx.datetime)
+
+                implementation(libs.sqldelight.runtime)
+                implementation(libs.sqldelight.coroutines.extensions)
+
+                api(libs.koin.core)
+                implementation(libs.koin.test)
+
+                api(libs.kermit)
+                api(libs.bundles.multiplatformSettings)
             }
         }
 
         androidMain {
             dependencies {
-                implementation("io.ktor:ktor-client-android:${Versions.ktor}")
-                implementation("app.cash.sqldelight:android-driver:${Versions.sqlDelight}")
+                implementation(libs.ktor.client.android)
+                implementation(libs.sqldelight.android.driver)
             }
         }
 
         iosMain {
             dependencies {
-                implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
-                implementation("app.cash.sqldelight:native-driver:${Versions.sqlDelight}")
+                implementation(libs.ktor.client.darwin)
+                implementation(libs.sqldelight.native.driver)
             }
         }
 
         macosMain {
             dependencies {
-                implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
-                implementation("app.cash.sqldelight:native-driver-macosx64:${Versions.sqlDelight}")
-                }
+                implementation(libs.ktor.client.darwin)
+                implementation(libs.sqldelight.native.driver)
+            }
         }
 
         jvmMain {
             dependencies {
-                implementation(Deps.Ktor.clientJava)
-                //implementation(Ktor.slf4j)
-                implementation("app.cash.sqldelight:sqlite-driver:${Versions.sqlDelight}")
+                implementation(libs.ktor.client.java)
+                implementation(libs.sqldelight.sqlite.driver)
+                implementation(libs.slf4j)
             }
         }
     }

diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts
@@ -3,9 +3,9 @@ import java.io.FileInputStream
 import java.util.*
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
     kotlin("android")
-    id("com.google.gms.google-services")
+    alias(libs.plugins.googleServices)
 }
 
 
@@ -40,7 +40,7 @@ fun versionName(): String {
 
 
 android {
-    compileSdk = AndroidSdk.compile
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     signingConfigs {
 
@@ -62,8 +62,8 @@ android {
 
     defaultConfig {
         applicationId = "dev.johnoreilly.galwaybus"
-        minSdk = AndroidSdk.min
-        targetSdk = AndroidSdk.target
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
 
         this.versionCode = versionCode()
         this.versionName = versionName()
@@ -79,7 +79,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Versions.composeCompiler
+        kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
     }
 
 
@@ -117,28 +117,29 @@ dependencies {
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("androidx.activity:activity-compose:1.7.2")
 
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.foundation.layout)
+    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material.iconsExtended)
+    implementation(libs.androidx.compose.material3.windowSizeClass)
 
-    with(Deps.Koin) {
-        implementation(core)
-        implementation(android)
-    }
+    implementation("com.google.maps.android:maps-compose:2.11.0")
+    implementation("com.google.maps.android:maps-compose-utils:2.11.0")
+
+    implementation(libs.accompanist.swiperefresh)
+
+
+
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.androidx.compose)
 
-    with(Deps.Compose) {
-        implementation(ui)
-        implementation(uiGraphics)
-        implementation(uiTooling)
-        implementation(foundationLayout)
-        implementation(material)
-        implementation(materialIconsExtended)
-        implementation(navigation)
-        implementation(accompanistPlaceholder)
-        implementation(accompanistSwipeRefresh)
-        implementation(mapsCompose)
-        implementation(mapsComposeUtils)
-
-        implementation(material3)
-        implementation(material3WindowSizeClass)
-    }
     implementation("io.github.pushpalroy:jetlime:2.0.1")
 
     // TODO: Added this as a temporary fix for a crash in ProgressIndicator, can be removed later.
@@ -147,10 +148,8 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1")
     implementation("com.google.maps.android:android-maps-utils:2.3.0")
 
-    with(Deps.PlayServices) {
-        implementation(maps)
-        implementation(location)
-    }
+    implementation("com.google.android.gms:play-services-location:16.0.0")
+    implementation("com.google.android.gms:play-services-maps:18.0.2")
 
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")

diff --git a/android-app/src/main/java/dev/johnoreilly/galwaybus/ui/screens/BikeShareScreen.kt b/android-app/src/main/java/dev/johnoreilly/galwaybus/ui/screens/BikeShareScreen.kt
@@ -1,11 +1,8 @@
-@file:OptIn(ExperimentalMaterial3Api::class)
-
 package dev.johnoreilly.galwaybus.ui.screens
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -24,7 +21,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
@@ -34,10 +30,9 @@ import dev.johnoreilly.galwaybus.R
 import dev.johnoreilly.galwaybus.ui.theme.highAvailabilityColor
 import dev.johnoreilly.galwaybus.ui.theme.lowAvailabilityColor
 import dev.johnoreilly.galwaybus.ui.viewmodel.GalwayBusViewModel
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 
 
-@OptIn(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BikeShareScreen(viewModel: GalwayBusViewModel) {
     val stationsState by viewModel.stations.collectAsState()

diff --git a/android-app/src/main/java/dev/johnoreilly/galwaybus/ui/screens/BusInfoScreen.kt b/android-app/src/main/java/dev/johnoreilly/galwaybus/ui/screens/BusInfoScreen.kt
@@ -6,7 +6,7 @@ import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -22,6 +22,7 @@ import dev.johnoreilly.galwaybus.R
 import dev.johnoreilly.galwaybus.ui.viewmodel.GalwayBusViewModel
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BusInfoScreen(viewModel: GalwayBusViewModel,
                   popBack: () -> Unit, onBusSelected: (String) -> Unit) {
@@ -35,7 +36,7 @@ fun BusInfoScreen(viewModel: GalwayBusViewModel,
             title = { Text(routeId ?: "") },
             navigationIcon = {
                 IconButton(onClick = { popBack() }) {
-                    Icon(Icons.Filled.ArrowBack, contentDescription = "Back")
+                    Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                 }
             }
         )},

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,14 @@
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.kmpNativeCoroutines) apply false
+    alias(libs.plugins.sqlDelight) apply false
+}
+
 
+/*
 buildscript {
 
     repositories {
@@ -25,3 +35,4 @@ allprojects {
     }
 }
 
+*/
diff --git a/buildSrc/build.gradle.kts → buildSrc2/build.gradle.kts b/buildSrc/build.gradle.kts → buildSrc2/build.gradle.kts
diff --git a/buildSrc/local.properties → buildSrc2/local.properties b/buildSrc/local.properties → buildSrc2/local.properties