Merge pull request #81 from joreilly/dependency_upddates

Kotlin 2.0 + related dependencies

README.md

@@ -1,3 +1,5 @@
+![kotlin-version](https://img.shields.io/badge/kotlin-2.0.0-blue?logo=kotlin)
+
 Kotlin/Compose Multiplatform project to show climate related emission data from https://climatetrace.org/data. Development just started so very much work in progress right now!
 Have started with showing sector emission data per country but ton of other info available as well (ideas very welcome!).
 
@@ -47,3 +49,16 @@ The iOS client as mentioned includes shared Compose Multiplatform UI code.  It a
 
 <img width="694" alt="Screenshot 2023-12-14 at 20 33 45" src="https://github.com/joreilly/ClimateTraceKMP/assets/6302/82ed364a-0284-4e5c-b81e-40fdfc58f312">
 
+## Full set of Kotlin Multiplatform/Compose/SwiftUI samples
+
+*  PeopleInSpace (https://github.com/joreilly/PeopleInSpace)
+*  GalwayBus (https://github.com/joreilly/GalwayBus)
+*  Confetti (https://github.com/joreilly/Confetti)
+*  BikeShare (https://github.com/joreilly/BikeShare)
+*  FantasyPremierLeague (https://github.com/joreilly/FantasyPremierLeague)
+*  ClimateTrace (https://github.com/joreilly/ClimateTraceKMP)
+*  GeminiKMP (https://github.com/joreilly/GeminiKMP)
+*  MortyComposeKMM (https://github.com/joreilly/MortyComposeKMM)
+*  StarWars (https://github.com/joreilly/StarWars)
+*  WordMasterKMP (https://github.com/joreilly/WordMasterKMP)
+*  Chip-8 (https://github.com/joreilly/chip-8)

gradle/libs.versions.toml

@@ -1,21 +1,24 @@
 [versions]
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
+kotlinx-coroutines = "1.8.1"
+
+
 agp = "8.2.2"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
 androidx-activityCompose = "1.9.0"
-compose = "1.6.6"
-compose-plugin = "1.6.10-beta03"
+compose = "1.6.7"
+compose-plugin = "1.6.10"
 composeWindowSize = "0.5.0"
 harawata-appdirs = "1.2.1"
 koalaplot = "0.5.3"
-koin = "3.6.0-alpha3"
-koinCompose = "1.2.0-alpha3"
-kotlin = "2.0.0-RC2"
-kotlinx-coroutines = "1.8.0"
-kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
-kmpObservableViewModel = "1.0.0-BETA-1-kotlin-2.0.0-RC2"
-ksp = "2.0.0-RC2-1.0.20"
+koin = "3.6.0-Beta4"
+koin-android-compose = "3.6.0-Beta4"
+koin-compose-multiplatform = "1.2.0-Beta4"
+kmpNativeCoroutines = "1.0.0-ALPHA-31"
+kmpObservableViewModel = "1.0.0-BETA-3"
 kstore = "0.8.0"
 ktor = "3.0.0-wasm2"
 treemapChart = "0.1.1"
@@ -30,7 +33,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
 compose-window-size = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version.ref = "composeWindowSize" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinCompose" }
+koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose-multiplatform" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,22 +1,23 @@
-rootProject.name = "ClimateTraceKMP"
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
 pluginManagement {
     repositories {
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        google()
-        gradlePluginPortal()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
-
 dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
     }
 }
 
+rootProject.name = "ClimateTraceKMP"
 include(":composeApp")