From 3441487775a2d6093ff12a94ff50f2ab7927e1fd Mon Sep 17 00:00:00 2001
From: Siarhei Luskanau <siarhei.luskanau@gmail.com>
Date: Wed, 2 Oct 2024 13:15:38 +0200
Subject: [PATCH] Updated Kotlin to "1.9.25", Compose Multiplatform to
 "1.7.0-rc01" and compose compiler to "1.5.15"

---
 .gitignore                | 1 +
 build.gradle.kts          | 5 -----
 gradle/libs.versions.toml | 7 +++----
 settings.gradle.kts       | 8 ++++++++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3079698898b..3e14b29f3ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .gradle
 .idea
+.kotlin
 build
 local.properties
 
diff --git a/build.gradle.kts b/build.gradle.kts
index ab72ea48f6b..8ffc5fb9478 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,11 +19,6 @@ allprojects {
   group = "app.cash.paging"
   version = "${rootProject.libs.versions.androidx.paging.get()}-0.6.0-SNAPSHOT"
 
-  repositories {
-    mavenCentral()
-    google()
-  }
-
   plugins.withId("org.jetbrains.kotlin.multiplatform") {
     configure<KotlinMultiplatformExtension> {
       jvmToolchain(11)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 00fa03ec5ba..c034bc33911 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,19 +3,19 @@ android = "8.7.0"
 androidx-activity-compose = "1.9.2"
 androidx-appcompat = "1.7.0"
 androidx-paging = "3.3.0-alpha02"
-kotlin = "1.9.24"
+kotlin = "1.9.25"
 kotlinx-coroutines = "1.9.0"
 kotlinx-serialization-json = "1.7.3"
 ktor = "2.3.12"
 maven-publish = "0.29.0"
 spotless = "6.25.0"
-jb-compose-plugin = "1.6.11"
+jb-compose-plugin = "1.7.0-rc01"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 # Specify the full coordinate for Renovate to track even though we only use the version.
-androidx-compose-compiler = "androidx.compose.compiler:compiler:1.5.14"
+androidx-compose-compiler = "androidx.compose.compiler:compiler:1.5.15"
 androidx-compose-material = { module = "androidx.compose.material:material", version = "1.7.2" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version = "1.7.2" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" }
@@ -28,7 +28,6 @@ kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.25.
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-core-iosarm64 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-iossimulatorarm64", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-core-iossimulatorarm64 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-iossimulatorarm64", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9e4aa2b8fc6..4d9909b3b59 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,6 +10,14 @@ pluginManagement {
   }
 }
 
+dependencyResolutionManagement {
+  repositories {
+    mavenCentral()
+    google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev/")
+  }
+}
+
 include(":paging-common")
 include(":paging-compose-common")
 include(":paging-runtime-uikit")