Merge pull request #137 from joreilly/dependency_updates

joreilly · web-flow · commit 54d65d8ed622 · 2025-05-03T16:42:08.000+01:00
dependency updates + updated year handling
diff --git a/composeApp/ClimateTrace.ipynb b/composeApp/ClimateTrace.ipynb
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/CountryInfoDetailedView.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/CountryInfoDetailedView.kt
@@ -79,7 +79,7 @@ fun CountryInfoDetailedViewSuccess(viewState: CountryDetailsUIState.Success, onY
         val countryAssetEmissionsList = viewState.countryAssetEmissionsList
         val countryEmissionInfo = viewState.countryEmissionInfo
 
-        YearSelector(year, onYearSelected)
+        YearSelector(year, viewState.availableYears, onYearSelected)
         countryEmissionInfo?.let {
             val co2 = (countryEmissionInfo.emissions.co2 / 1_000_000).toInt()
             val percentage =
@@ -112,17 +112,16 @@ fun CountryInfoDetailedViewSuccess(viewState: CountryDetailsUIState.Success, onY
 
 
 @Composable
-fun YearSelector(selectedYear: String, onYearSelected: (String) -> Unit) {
+fun YearSelector(selectedYear: String, availableYears: List<String>, onYearSelected: (String) -> Unit) {
     var expanded by remember { mutableStateOf(false) }
-    val items = listOf("2021", "2022")
 
     Box(modifier = Modifier.wrapContentSize(Alignment.TopStart)) {
         Text(selectedYear, modifier = Modifier.clickable(onClick = { expanded = true }))
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
         ) {
-            items.forEach { year ->
+            availableYears.forEach { year ->
                 DropdownMenuItem(onClick = {
                     onYearSelected(year)
                     expanded = false
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/CountryDetailsViewModel.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/CountryDetailsViewModel.kt
@@ -28,6 +28,7 @@ sealed class CountryDetailsUIState {
     data class Success(
         val country: Country,
         val year: String,
+        val availableYears: List<String>,
         val countryEmissionInfo: CountryEmissionsInfo?,
         val countryAssetEmissionsList: List<CountryAssetEmissionsInfo>
     ) : CountryDetailsUIState()
@@ -40,6 +41,7 @@ sealed interface CountryDetailsEvents {
 
 open class CountryDetailsViewModel : ViewModel(), KoinComponent {
     private val climateTraceRepository: ClimateTraceRepository by inject()
+    private val availableYears = listOf("2021", "2022", "2023", "2024")
 
     private val events = MutableSharedFlow<CountryDetailsEvents>(extraBufferCapacity = 20)
 
@@ -59,7 +61,7 @@ open class CountryDetailsViewModel : ViewModel(), KoinComponent {
     fun CountryDetailsPresenter(events: Flow<CountryDetailsEvents>): CountryDetailsUIState {
         var uiState by remember { mutableStateOf<CountryDetailsUIState>(CountryDetailsUIState.NoCountrySelected) }
         var selectedCountry by remember { mutableStateOf<Country?>(null) }
-        var selectedYear by remember { mutableStateOf("2022") }
+        var selectedYear by remember { mutableStateOf("2024") }
 
         LaunchedEffect(Unit) {
             events.collect { event ->
@@ -76,9 +78,9 @@ open class CountryDetailsViewModel : ViewModel(), KoinComponent {
                 try {
                     val countryEmissionInfo = climateTraceRepository.fetchCountryEmissionsInfo(country.alpha3, selectedYear).firstOrNull()
                     val countryAssetEmissionsList = climateTraceRepository.fetchCountryAssetEmissionsInfo(country.alpha3)
-                    uiState = CountryDetailsUIState.Success(country, selectedYear, countryEmissionInfo, countryAssetEmissionsList)
+                    uiState = CountryDetailsUIState.Success(country, selectedYear, availableYears, countryEmissionInfo, countryAssetEmissionsList)
                 } catch (e: Exception) {
-                    uiState = CountryDetailsUIState.Error("Error retrieving data from backend")
+                    uiState = CountryDetailsUIState.Error("Error retrieving data from backend, ${e.message}")
                 }
             }
         }
diff --git a/composeApp/src/commonTest/kotlin/dev/johnoreilly/climatetrace/screen/ClimateTraceTestsScreen.kt b/composeApp/src/commonTest/kotlin/dev/johnoreilly/climatetrace/screen/ClimateTraceTestsScreen.kt
@@ -35,7 +35,7 @@ class ClimateTraceScreenTest {
     @Test
     fun testCountryInfoDetailsView() = runComposeUiTest {
         val state = CountryDetailsUIState.Success(country,
-            year, countryEmissionsInfo, emptyList()
+            year, listOf("2022", "2023"), countryEmissionsInfo, emptyList()
         )
         setContent {
             CountryInfoDetailedView(state, {})
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,25 @@
 [versions]
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
-kotlinx-coroutines = "1.9.0"
+kotlin = "2.1.20"
+ksp = "2.1.20-2.0.0"
+kotlinx-coroutines = "1.10.1"
 
 
-agp = "8.7.3"
-android-compileSdk = "34"
+agp = "8.9.2"
+android-compileSdk = "35"
 android-minSdk = "24"
-android-targetSdk = "34"
-androidx-activityCompose = "1.9.3"
-compose = "1.7.6"
+android-targetSdk = "35"
+androidx-activityCompose = "1.10.1"
+compose = "1.8.0"
 compose-plugin = "1.7.3"
 composeAdaptiveLayout = "1.0.0"
 harawata-appdirs = "1.2.2"
 koalaplot = "0.5.3"
-koin = "4.0.1-Beta1"
-koin-compose-multiplatform = "4.0.1-Beta1"
+koin = "4.0.4"
+koin-compose-multiplatform = "4.0.4"
 kmpNativeCoroutines = "1.0.0-ALPHA-38"
 kmpObservableViewModel = "1.0.0-BETA-7"
 kstore = "0.8.0"
-ktor = "3.0.1"
+ktor = "3.1.1"
 treemapChart = "0.1.1"
 voyager= "1.1.0-beta03"
 molecule =  "2.0.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -2806,12 +2806,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
-
-ws@^8.13.0:
+ws@8.18.0, ws@^8.13.0:
   version "8.18.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
   integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class ClimateTraceScreenTest {`
`35`	`35`	`@Test`
`36`	`36`	`fun testCountryInfoDetailsView() = runComposeUiTest {`
`37`	`37`	`val state = CountryDetailsUIState.Success(country,`
`38`		`- year, countryEmissionsInfo, emptyList()`
	`38`	`+ year, listOf("2022", "2023"), countryEmissionsInfo, emptyList()`
`39`	`39`	`)`
`40`	`40`	`setContent {`
`41`	`41`	`CountryInfoDetailedView(state, {})`