Upgraded to Kotlin 2.0.20 and Compose 1.6.11

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-appleMain.cinteropLibraries.json

@@ -0,0 +1,12 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-appleTest.cinteropLibraries.json

@@ -0,0 +1,17 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "co.touchlab:sqliter-driver:1.3.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/co.touchlab-sqliter-driver-1.3.1-appleMain-cinterop/co.touchlab_sqliter-driver-cinterop-sqlite3-jZj4Kg.klib",
+    "sourceSetName": "appleMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-iosMain.cinteropLibraries.json

@@ -0,0 +1,17 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "co.touchlab:sqliter-driver:1.3.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/co.touchlab-sqliter-driver-1.3.1-appleMain-cinterop/co.touchlab_sqliter-driver-cinterop-sqlite3-jZj4Kg.klib",
+    "sourceSetName": "appleMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-iosTest.cinteropLibraries.json

@@ -0,0 +1,17 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "co.touchlab:sqliter-driver:1.3.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/co.touchlab-sqliter-driver-1.3.1-appleMain-cinterop/co.touchlab_sqliter-driver-cinterop-sqlite3-jZj4Kg.klib",
+    "sourceSetName": "appleMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-nativeMain.cinteropLibraries.json

@@ -0,0 +1,12 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/.shared-nativeTest.cinteropLibraries.json

@@ -0,0 +1,17 @@
+[
+  {
+    "moduleId": "org.jetbrains.kotlinx:atomicfu:0.23.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib",
+    "sourceSetName": "nativeMain"
+  },
+  {
+    "moduleId": "co.touchlab:sqliter-driver:1.3.1",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/co.touchlab-sqliter-driver-1.3.1-appleMain-cinterop/co.touchlab_sqliter-driver-cinterop-sqlite3-jZj4Kg.klib",
+    "sourceSetName": "appleMain"
+  },
+  {
+    "moduleId": "io.ktor:ktor-utils:2.3.11",
+    "file": "/Users/daniele/Dev/KMP/D-KMP-sample/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.11-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib",
+    "sourceSetName": "iosMain"
+  }
+]

gradle.properties

@@ -8,5 +8,4 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true
 
 #MPP
-kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
-kotlin="2.0.0"
-compose="1.6.10"
+kotlin="2.0.20"
+compose="1.6.11"
 android-targetSdk="34"
 android-compileSdk="34"
 android-minSdk="24"
-android-gradle-plugin="8.2.0"
+android-gradle-plugin="8.2.2"
 android-material = "1.12.0"
-android-desugar-jdk = "2.0.4"
-androidx-activity-compose = "1.9.0"
-androidx-lifecycle = "2.8.2"
-kotlinx-coroutines = "1.8.0"
+android-desugar-jdk = "2.1.2"
+androidx-activity-compose = "1.9.2"
+androidx-lifecycle = "2.8.6"
+kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.6.3"
-kotlinx-datetime = "0.5.0"
+kotlinx-datetime = "0.6.0"
 ktor="2.3.11"
-skie="0.8.2"
+skie="0.9.0"
 multiplatformSettings="1.0.0"
 sqlDelight="2.0.2"
 slf4j = "2.0.9"

iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/daniele.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

iosApp/iosApp.xcodeproj/xcuserdata/daniele.xcuserdatad/xcschemes/iosApp.xcscheme

@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   version = "1.3">
-   <BuildAction>
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForRunning = "YES">
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -15,11 +21,25 @@
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
    <LaunchAction
-      useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7555FF7A242A565900829871"
@@ -29,4 +49,18 @@
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>

iosApp/iosApp/views/navigation/ScreenPicker.swift

@@ -11,21 +11,21 @@ import shared
 extension Navigation {
 
     @ViewBuilder func screenPicker(requestedSId: ScreenIdentifier, appObj: AppObservableObject) -> some View {
-            
+
         VStack {
 
             let state = appObj.getScreenState(sID: requestedSId)
 
             switch requestedSId.screen {
 
-            case .countrieslist:
+            case .countriesList:
                 CountriesListScreen(
                     countriesListState: state as! CountriesListState,
-                    onListItemClick: { name in self.navigate(.countrydetail, CountryDetailParams(countryName: name)) },
+                    onListItemClick: { name in self.navigate(.countryDetail, CountryDetailParams(countryName: name)) },
                     onFavoriteIconClick: { name in self.events.selectFavorite(countryName: name) }
                 )
 
-            case .countrydetail:
+            case .countryDetail:
                 CountryDetailScreen(
                     countryDetailState: state as! CountryDetailState
                 )
@@ -54,7 +54,7 @@ extension Navigation {
 
         switch level1ScreenIdentifier.screen {
 
-        case .countrieslist: CountriesListTwoPaneDefaultDetail()
+        case .countriesList: CountriesListTwoPaneDefaultDetail()
 
         default:
             EmptyView()

iosApp/iosApp/views/navigation/bars/Level1BottomBar.swift

@@ -22,15 +22,15 @@ struct Level1ButtonBar: View {
         BottomBarButton(
             itemLabel: "All Countries",
             iconName: "list.bullet",
-            selected: level1ScreenIdentifier.URI==Level1Navigation.allcountries.screenIdentifier.URI,
-            onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.allcountries) }
+            selected: level1ScreenIdentifier.URI==Level1Navigation.allCountries.screenIdentifier.URI,
+            onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.allCountries) }
         )
         Spacer()
         BottomBarButton(
             itemLabel: "Favorites",
             iconName: "star.fill",
-            selected: level1ScreenIdentifier.URI==Level1Navigation.favoritecountries.screenIdentifier.URI,
-            onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.favoritecountries) }
+            selected: level1ScreenIdentifier.URI==Level1Navigation.favoriteCountries.screenIdentifier.URI,
+            onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.favoriteCountries) }
         )
         Spacer()
     }

iosApp/iosApp/views/navigation/bars/Level1NavigationRail.swift

@@ -23,14 +23,14 @@ struct Level1NavigationRail: View {
             NavigationRailButton(
                 itemLabel: "All Countries",
                 iconName: "list.bullet",
-                selected: level1ScreenIdentifier.URI==Level1Navigation.allcountries.screenIdentifier.URI,
-                onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.allcountries) }
+                selected: level1ScreenIdentifier.URI==Level1Navigation.allCountries.screenIdentifier.URI,
+                onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.allCountries) }
             )
             NavigationRailButton(
                 itemLabel: "Favorites",
                 iconName: "star.fill",
-                selected: level1ScreenIdentifier.URI==Level1Navigation.favoritecountries.screenIdentifier.URI,
-                onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.favoritecountries) }
+                selected: level1ScreenIdentifier.URI==Level1Navigation.favoriteCountries.screenIdentifier.URI,
+                onClick: { appObj.dkmpNav.navigateByLevel1Menu(appObj, level1Navigation: Level1Navigation.favoriteCountries) }
             )
             Spacer()
         }

settings.gradle.kts

@@ -2,18 +2,28 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
         mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        gradlePluginPortal()
     }
 }
 
 dependencyResolutionManagement {
     repositories {
-        google()
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
         mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }
 

shared/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 group = "eu.baroncelli.dkmpsample"
 version = "1.0-SNAPSHOT"
 
@@ -29,6 +27,13 @@ kotlin {
             binaryOption("bundleId", "eu.baroncelli.dkmpsample.shared")
         }
     }
+    targets.configureEach {
+        compilations.configureEach {
+            compileTaskProvider.get().compilerOptions {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
     sourceSets {
 
         commonMain.dependencies {
@@ -81,13 +86,11 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_18
         targetCompatibility = JavaVersion.VERSION_18
+        isCoreLibraryDesugaringEnabled = true
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -102,11 +105,4 @@ sqldelight {
             srcDirs("src/commonMain/kotlin")
         }
     }
-}
-
-
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        freeCompilerArgs += "-Xexpect-actual-classes"
-    }
 }