- updated versions and configurations

coderwise · coderwise · commit ec5d3f21658e · 2025-03-28T14:13:23.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,5 +7,5 @@ plugins {
     alias(libs.plugins.kotlinAndroid) apply false
 
     alias(libs.plugins.kotlinMultiplatformLibrary) apply false
-    alias(libs.plugins.jetbrainsKotlinJvm) apply false
+    alias(libs.plugins.kotlinJvm) apply false
 }
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -11,10 +11,8 @@ plugins {
 
 kotlin {
     androidTarget {
-        compilations.all {
-            compileTaskProvider.configure {
-                compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
-            }
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 
diff --git a/composeApp/src/commonMain/kotlin/com/coderwise/core/ui/App.kt b/composeApp/src/commonMain/kotlin/com/coderwise/core/ui/App.kt
@@ -10,6 +10,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -27,6 +28,7 @@ import com.coderwise.core.data.SampleRepository
 import com.coderwise.core.ui.arch.rememberNavRouter
 import com.coderwise.core.ui.arch.rememberUiMessenger
 import com.coderwise.core.ui.component.CoreTopBar
+import com.coderwise.core.ui.component.TopBarAction
 import com.coderwise.core.ui.location.LocationRoute
 import com.coderwise.core.ui.location.LocationScreen
 import com.coderwise.core.ui.permissions.PermissionsRoute
@@ -87,15 +89,7 @@ private fun RootUi() {
                     showBackNavigation = showBackNavigation,
                     onNavigationClick = navRouter::navigateUp,
                     actions = listOf(
-                        {
-                            IconButton(
-                                onClick = {
-                                    scope.launch { sampleRepository.reset() }
-                                }
-                            ) {
-                                Icon(Icons.Default.Delete, null)
-                            }
-                        }
+                        TopBarAction(Icons.Default.Delete) { scope.launch { sampleRepository.reset() } }
                     )
                 )
             },
diff --git a/core-data/build.gradle.kts b/core-data/build.gradle.kts
@@ -13,16 +13,14 @@ kotlin {
         compileSdk = libs.versions.compileSdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
 
+        @Suppress("UnstableApiUsage")
         withHostTestBuilder {
         }
     }
 
-    listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {
-        it.binaries.framework {
-            baseName = "core-dataKit"
-            isStatic = true
-        }
-    }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     jvm("desktop")
 
diff --git a/core-domain/build.gradle.kts b/core-domain/build.gradle.kts
@@ -16,12 +16,9 @@ kotlin {
         }
     }
 
-    listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {
-        it.binaries.framework {
-            baseName = "core-domainKit"
-            isStatic = true
-        }
-    }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     jvm("desktop")
 
diff --git a/core-location/build.gradle.kts b/core-location/build.gradle.kts
@@ -46,4 +46,4 @@ kotlin {
 }
 
 group = "com.coderwise.core.location"
-version = "1.0"
+version = libs.versions.coderwiseCore.get()
diff --git a/core-permissions/build.gradle.kts b/core-permissions/build.gradle.kts
@@ -58,7 +58,7 @@ kotlin {
 }
 
 group = "com.coderwise.core.permissions"
-version = "1.0"
+version = libs.versions.coderwiseCore.get()
 
 publishing {
 
diff --git a/core-time/build.gradle.kts b/core-time/build.gradle.kts
@@ -43,4 +43,4 @@ kotlin {
 }
 
 group = "com.coderwise.core.time"
-version = "1.0"
+version = libs.versions.coderwiseCore.get()
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
@@ -15,12 +15,9 @@ kotlin {
         minSdk = libs.versions.minSdk.get().toInt()
     }
 
-    listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {
-        it.binaries.framework {
-            baseName = "core-uiKit"
-            isStatic = true
-        }
-    }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     jvm("desktop")
 
diff --git a/core-ui/src/androidMain/kotlin/com/coderwise/core/ui/utils/ContextExt.kt b/core-ui/src/androidMain/kotlin/com/coderwise/core/ui/utils/ContextExt.kt
@@ -2,7 +2,7 @@ package com.coderwise.core.ui.utils
 
 import android.content.Context
 import android.content.Intent
-import androidx.core.uri.Uri
+import android.net.Uri
 
 fun Context.openPage(
     action: String,
diff --git a/core-ui/src/commonMain/kotlin/com/coderwise/core/ui/component/CoreDropdown.kt b/core-ui/src/commonMain/kotlin/com/coderwise/core/ui/component/CoreDropdown.kt
@@ -2,9 +2,9 @@ package com.coderwise.core.ui.component
 
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExposedDropdownMenuAnchorType
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
+import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
@@ -78,7 +78,7 @@ internal fun <T> CoreBaseDropdown(
     ) {
         if (outlined) {
             OutlinedTextField(
-                modifier = modifier.menuAnchor(type = ExposedDropdownMenuAnchorType.PrimaryNotEditable),
+                modifier = modifier.menuAnchor(type = MenuAnchorType.PrimaryNotEditable),
                 readOnly = true,
                 value = options[selectedIndex].toString(),
                 onValueChange = {},
@@ -88,7 +88,7 @@ internal fun <T> CoreBaseDropdown(
             )
         } else {
             TextField(
-                modifier = modifier.menuAnchor(type = ExposedDropdownMenuAnchorType.PrimaryNotEditable),
+                modifier = modifier.menuAnchor(type = MenuAnchorType.PrimaryNotEditable),
                 readOnly = true,
                 value = options[selectedIndex].toString(),
                 onValueChange = {},
diff --git a/core-ui/src/commonMain/kotlin/com/coderwise/core/ui/component/CoreTopBar.kt b/core-ui/src/commonMain/kotlin/com/coderwise/core/ui/component/CoreTopBar.kt
@@ -11,11 +11,21 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import com.coderwise.core.ui.utils.CorePreview
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
+
+data class TopBarAction(
+    val imageVector: ImageVector,
+    val contentDescription: String? = null,
+    val onClick: () -> Unit
+)
+
 data class TopBarConfiguration(
-    val actions: List<@Composable () -> Unit> = emptyList()
+    val title: String,
+    val showBackNavigation: Boolean = false,
+    val actions: List<TopBarAction> = emptyList()
 )
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -25,7 +35,7 @@ fun CoreTopBar(
     modifier: Modifier = Modifier,
     showBackNavigation: Boolean = false,
     onNavigationClick: () -> Unit = {},
-    actions: List<@Composable () -> Unit> = emptyList()
+    actions: List<TopBarAction> = emptyList()
 ) {
     TopAppBar(
         title = { Text(text = title) },
@@ -43,7 +53,16 @@ fun CoreTopBar(
             }
         },
         actions = {
-            actions.forEach { it() }
+            actions.forEach {
+                IconButton(
+                    onClick = it.onClick
+                ) {
+                    Icon(
+                        imageVector = it.imageVector,
+                        contentDescription = it.contentDescription
+                    )
+                }
+            }
         }
     )
 }
@@ -69,14 +88,12 @@ internal fun CoreTopBarPreview() {
                 title = "Trips",
                 showBackNavigation = true,
                 onNavigationClick = {},
-                actions = listOf {
-                    IconButton(onClick = { /* doSomething() */ }) {
-                        Icon(
-                            imageVector = Icons.Filled.Delete,
-                            contentDescription = "Localized description"
-                        )
-                    }
-                }
+                actions = listOf(
+                    TopBarAction(
+                        imageVector = Icons.Filled.Delete,
+                        contentDescription = "Localized description"
+                    ) {}
+                )
             )
         }
     }
diff --git a/core-versioning/build.gradle.kts b/core-versioning/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinJvm)
+    alias(libs.plugins.kotlinJvm)
     id("java-gradle-plugin")
     id("maven-publish")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,23 @@
 [versions]
 
 compileSdk = "35"
-gradle = "8.1.4"
-kotlinGradlePlugin = "1.8.20"
 minSdk = "26"
 
 agp = "8.9.1"
 kotlin = "2.1.10"
+kotlinGradlePlugin = "1.8.20"
 activityCompose = "1.10.1"
 lifecycleRuntimeKtx = "2.8.7"
-koin = "4.0.0"
-datastore = "1.1.3"
+koin = "4.0.2"
+datastore = "1.1.4"
 kotlinxSerialization = "1.8.0"
-composeMultiplatform = "1.8.0-alpha03"
-navigationCompose = "2.8.0-alpha13" # 2.8.0-alpha13 is breaking the build!!!
+composeMultiplatform = "1.8.0-beta01"
+navigationCompose = "2.8.0-alpha10" # 2.8.0-alpha13 is breaking the build!!!
 kotlinxCoroutines = "1.10.1"
-mockk = "1.13.5"
+mockk = "1.13.17"
 kotlinxDatetime = "0.6.2"
 coderwiseCore = "1.0"
-kotlinStdlibVersion = "2.1.10"
 composeTooling = "1.7.8"
-jetbrainsKotlinJvm = "2.1.10"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
@@ -45,10 +42,10 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdlibVersion" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 
 # plugin development
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 
 [plugins]
@@ -60,6 +57,6 @@ kotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library",
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-jetbrainsKotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrainsKotlinJvm" }
+kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
-coreVersioning = { id = "com.coderwise.core.versioning", version = "1.0" }
+coreVersioning = { id = "com.coderwise.core.versioning", version = "coderwiseCore" }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ plugins {`
`7`	`7`	`alias(libs.plugins.kotlinAndroid) apply false`
`8`	`8`
`9`	`9`	`alias(libs.plugins.kotlinMultiplatformLibrary) apply false`
`10`		`- alias(libs.plugins.jetbrainsKotlinJvm) apply false`
	`10`	`+ alias(libs.plugins.kotlinJvm) apply false`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,8 @@ plugins {`
`11`	`11`
`12`	`12`	`kotlin {`
`13`	`13`	`androidTarget {`
`14`		`- compilations.all {`
`15`		`- compileTaskProvider.configure {`
`16`		`- compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }`
`17`		`- }`
	`14`	`+ compilerOptions {`
	`15`	`+ jvmTarget.set(JvmTarget.JVM_1_8)`
`18`	`16`	`}`
`19`	`17`	`}`
`20`	`18`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,9 @@ kotlin {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {`
`20`		`- it.binaries.framework {`
`21`		`- baseName = "core-domainKit"`
`22`		`- isStatic = true`
`23`		`- }`
`24`		`- }`
	`19`	`+ iosX64()`
	`20`	`+ iosArm64()`
	`21`	`+ iosSimulatorArm64()`
`25`	`22`
`26`	`23`	`jvm("desktop")`
`27`	`24`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ kotlin {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`group = "com.coderwise.core.location"`
`49`		`-version = "1.0"`
	`49`	`+version = libs.versions.coderwiseCore.get()`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ kotlin {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`group = "com.coderwise.core.permissions"`
`61`		`-version = "1.0"`
	`61`	`+version = libs.versions.coderwiseCore.get()`
`62`	`62`
`63`	`63`	`publishing {`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,4 @@ kotlin {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`group = "com.coderwise.core.time"`
`46`		`-version = "1.0"`
	`46`	`+version = libs.versions.coderwiseCore.get()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- alias(libs.plugins.jetbrainsKotlinJvm)`
	`2`	`+ alias(libs.plugins.kotlinJvm)`
`3`	`3`	`id("java-gradle-plugin")`
`4`	`4`	`id("maven-publish")`
`5`	`5`	`}`