diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index b6cae7c..4dee1e8 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -25,6 +25,7 @@ kotlin { implementation(libs.androidx.navigation.compose) implementation(libs.koin.androidx.compose) implementation(libs.coil.compose) + implementation(libs.coil.network.ktor) } commonMain.dependencies { implementation(compose.runtime) diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/DetailScreen.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/DetailScreen.kt index f3229dd..1334daa 100644 --- a/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/DetailScreen.kt +++ b/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/DetailScreen.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp -import coil.compose.AsyncImage +import coil3.compose.AsyncImage import com.jetbrains.kmpapp.R import com.jetbrains.kmpapp.data.MuseumObject import org.koin.androidx.compose.koinViewModel diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/ListScreen.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/ListScreen.kt index 42d72b1..94dfa13 100644 --- a/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/ListScreen.kt +++ b/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/ListScreen.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import coil.compose.AsyncImage +import coil3.compose.AsyncImage import com.jetbrains.kmpapp.data.MuseumObject import org.koin.androidx.compose.koinViewModel diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34126bb..96cb5c5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -agp = "8.6.0" -androidx-activityCompose = "1.9.2" -androidx-navigationCompose = "2.8.1" -androidx-ui-tooling = "1.7.2" +agp = "8.6.1" +androidx-activityCompose = "1.9.3" +androidx-navigationCompose = "2.8.3" +androidx-ui-tooling = "1.7.4" androidx-viewmodelCompose = "2.8.6" -coil = "2.7.0" -compose-multiplatform = "1.6.11" -kmpObservableViewmodel = "1.0.0-BETA-5" -kmpNativeCoroutines = "1.0.0-ALPHA-35" +coil = "3.0.0-rc02" +compose-multiplatform = "1.7.0" +kmpObservableViewmodel = "1.0.0-BETA-7" +kmpNativeCoroutines = "1.0.0-ALPHA-37" koin = "4.0.0" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization = "1.7.3" -ksp = "2.0.20-1.0.25" -ktor = "2.3.12" +ksp = "2.0.21-1.0.25" +ktor = "3.0.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } @@ -20,7 +20,8 @@ androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", versi androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-ui-tooling" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigationCompose" } androidx-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-viewmodelCompose" } -coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } +coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" } +coil-network-ktor = { group = "io.coil-kt.coil3", name = "coil-network-ktor3", version.ref = "coil" } kmp-observable-viewmodel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewmodel" } koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 405b51b..209597c 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -23,7 +23,7 @@ 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; - 7555FF7B242A565900829871 /* KMP-App-Template-Native.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "KMP-App-Template-Native.app"; path = "KMP App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7555FF7B242A565900829871 /* KMP App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KMP App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF82242A565900829871 /* ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListView.swift; sourceTree = ""; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; @@ -74,7 +74,7 @@ 7555FF7C242A565900829871 /* Products */ = { isa = PBXGroup; children = ( - 7555FF7B242A565900829871 /* KMP-App-Template-Native.app */, + 7555FF7B242A565900829871 /* KMP App.app */, ); name = Products; sourceTree = ""; @@ -125,7 +125,7 @@ EB049B002C1AEB680032A688 /* KMPObservableViewModelSwiftUI */, ); productName = iosApp; - productReference = 7555FF7B242A565900829871 /* KMP-App-Template-Native.app */; + productReference = 7555FF7B242A565900829871 /* KMP App.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -417,7 +417,7 @@ repositoryURL = "https://github.com/rickclephas/KMP-ObservableViewModel"; requirement = { kind = exactVersion; - version = "1.0.0-BETA-5"; + version = "1.0.0-BETA-7"; }; }; EB50C48E2BE0EB69005DE781 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */ = { @@ -425,7 +425,7 @@ repositoryURL = "https://github.com/rickclephas/KMP-NativeCoroutines.git"; requirement = { kind = exactVersion; - version = "1.0.0-ALPHA-35-spm-async"; + version = "1.0.0-ALPHA-37-spm-async"; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 47fc2b6..34887a5 100644 --- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git", "state" : { - "revision" : "ca368019fe91808abf30d14bff796dd5cf024513", - "version" : "1.0.0-ALPHA-35-spm-async" + "revision" : "398072f9a010122bbcfff78040681743442fa8d6", + "version" : "1.0.0-ALPHA-37-spm-async" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/rickclephas/KMP-ObservableViewModel", "state" : { - "revision" : "32be3e95499a3f14e8639be17887f5d11f182ca3", - "version" : "1.0.0-BETA-5" + "revision" : "805c41ff1305b02909c3b50a7e34a46b3c029c04", + "version" : "1.0.0-BETA-7" } } ],