Bump most deps

Author: jdamcd

.github/workflows/push.yml

@@ -62,7 +62,7 @@ jobs:
           -resultBundlePath TestResults
 
     - name: Publish iOS results
-      uses: kishikawakatsumi/[email protected].0
+      uses: kishikawakatsumi/[email protected].1
       if: always()
       with:
         title: iOS results

android/src/main/kotlin/com/jdamcd/runlog/android/login/LoginActivity.kt

@@ -49,7 +49,7 @@ class LoginActivity : ComponentActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
     }

android/src/main/kotlin/com/jdamcd/runlog/android/training/ActivityViewModel.kt

@@ -22,13 +22,12 @@ class ActivityViewModel @Inject constructor(
 ) : ViewModel(),
     LifecycleObserver {
 
-    private val id: Long
+    private val id: Long = savedStateHandle.get<Long>(ROUTE_ACTIVITY_ID)!!
 
     private val _flow = MutableStateFlow<ActivityState>(ActivityState.Loading)
     val flow = _flow as StateFlow<ActivityState>
 
     init {
-        id = savedStateHandle.get<Long>(ROUTE_ACTIVITY_ID)!!
         load()
     }
 

android/src/test/kotlin/com/jdamcd/runlog/android/profile/ProfileViewModelTest.kt

@@ -29,6 +29,7 @@ class ProfileViewModelTest {
     @Test
     fun `emits initial loading state`() = runTest {
         every { stravaProfile.profileFlow() } returns MutableSharedFlow()
+        coEvery { stravaProfile.refresh() } returns RefreshState.LOADING
 
         val viewModel = ProfileViewModel(stravaProfile)
 
@@ -42,6 +43,7 @@ class ProfileViewModelTest {
     fun `emits loading then data`() = runTest {
         val profileFlow = MutableSharedFlow<Result<AthleteProfile>>()
         every { stravaProfile.profileFlow() } returns profileFlow
+        coEvery { stravaProfile.refresh() } returns RefreshState.LOADING
 
         val viewModel = ProfileViewModel(stravaProfile)
 

android/src/test/kotlin/com/jdamcd/runlog/android/training/ActivityViewModelTest.kt

@@ -13,48 +13,50 @@ import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
 @ExperimentalCoroutinesApi
 class ActivityViewModelTest {
 
-    @get:Rule
-    val coroutineRule = TestCoroutinesRule()
+    @get:Rule val coroutineRule = TestCoroutinesRule()
 
     private val stravaActivity: StravaActivity = mockk()
     private val activityDetails: ActivityDetails = mockk()
 
-    private lateinit var viewModel: ActivityViewModel
+    private val savedState = SavedStateHandle(initialState = mapOf("id" to 123L))
 
-    @Before
-    fun setUp() {
-        val state = SavedStateHandle(initialState = mapOf("id" to 123L))
-        viewModel = ActivityViewModel(state, stravaActivity)
+    @Test
+    fun `emits initial loading state`() = runTest {
+        coEvery { stravaActivity.activityDetails(123L) } returns Result.Empty
+
+        val viewModel = ActivityViewModel(savedState, stravaActivity)
+
+        viewModel.flow.test {
+            awaitItem() shouldBe ActivityState.Loading
+            cancelAndConsumeRemainingEvents()
+        }
     }
 
     @Test
-    fun `load success emits loading then data`() = runTest {
+    fun `load success emits data`() = runTest {
         coEvery { stravaActivity.activityDetails(123L) } returns Result.Data(activityDetails)
 
-        viewModel.flow.test {
-            viewModel.load()
+        val viewModel = ActivityViewModel(savedState, stravaActivity)
 
-            awaitItem() shouldBe ActivityState.Loading
+        viewModel.flow.test {
             awaitItem() shouldBe ActivityState.Data(activityDetails)
             cancelAndConsumeRemainingEvents()
         }
     }
 
     @Test
-    fun `load failure emits loading then error`() = runTest {
-        coEvery { stravaActivity.activityDetails(123L) } returns Result.Error(Throwable())
+    fun `load failure emits error`() = runTest {
+        coEvery { stravaActivity.activityDetails(123L) } returns Result.Error(Exception())
 
-        viewModel.flow.test {
-            viewModel.load()
+        val viewModel = ActivityViewModel(savedState, stravaActivity)
 
-            awaitItem() shouldBe ActivityState.Loading
+        viewModel.flow.test {
             awaitItem() shouldBe ActivityState.Error
             cancelAndConsumeRemainingEvents()
         }
@@ -63,8 +65,9 @@ class ActivityViewModelTest {
     @Test
     fun `generateLink forwards ID to make URL`() {
         every { stravaActivity.linkUrl(123L) } returns "url/123"
+        coEvery { stravaActivity.activityDetails(123L) } returns Result.Empty
 
-        viewModel.activityWebLink()
+        ActivityViewModel(savedState, stravaActivity).activityWebLink()
 
         verify { stravaActivity.linkUrl(123L) }
     }

buildSrc/src/main/kotlin/Config.kt

@@ -9,5 +9,5 @@ object AppConfig {
 
 object AndroidVersion {
     const val minimum = 26
-    const val target = 33
+    const val target = 35
 }

gradle/libs.versions.toml

@@ -7,33 +7,31 @@ spotless = "6.25.0"
 ktlint = "1.4.1"
 
 # Shared
-ktor = "2.1.2"
-coroutines = "1.6.4-native-mt"
-koin = "3.2.2"
+ktor = "3.0.1"
+coroutines = "1.9.0"
+koin = "3.5.6"
 sqlDelight = "1.5.5"
-dateTime = "0.4.0"
+dateTime = "0.6.1"
 
 # Android
 hilt = "2.52"
-hiltCompose = "1.0.0"
-composeBom = "2022.10.00"
+hiltCompose = "1.2.0"
+composeBom = "2024.11.00"
 composeCompiler = "1.5.15"
-constraintLayout = "1.0.1"
-material = "1.7.0"
-splash = "1.0.0"
-ktxCore = "1.9.0"
-ktxActivity = "1.6.0"
-lifecycle = "2.5.1"
-navigationCompose = "2.5.3"
-coil = "2.2.2"
+constraintLayout = "1.1.0"
+material = "1.12.0"
+splash = "1.0.1"
+ktxCore = "1.15.0"
+ktxActivity = "1.9.3"
+lifecycle = "2.8.7"
+navigationCompose = "2.8.4"
+coil = "2.7.0"
 
 # Test
-junit = "4.13.2"
-kotest = "5.5.2"
-mockk = "1.13.3"
-turbine = "0.12.1"
-archTest = "2.1.0"
-coroutinesTest = "1.6.4"
+kotest = "5.9.1"
+mockk = "1.13.13"
+turbine = "1.2.0"
+archTest = "2.2.0"
 
 [libraries]
 # Build
@@ -95,11 +93,10 @@ compose-navigation = { group = "androidx.navigation", name = "navigation-compose
 compose-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraintLayout" }
 
 # Test
-junit = { group = "junit", name = "junit", version.ref = "junit" }
 mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 kotest = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
 turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }
-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" }
+coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 arch-test = { group = "androidx.arch.core", name = "core-testing", version.ref = "archTest" }
 
 [bundles]