Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Kotlin to "1.9.25", Compose Multiplatform to "1.7.0-rc01" and compose compiler to "1.5.15" #333

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.gradle
.idea
.kotlin
build
local.properties

Expand Down
5 changes: 0 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3" }
androidx-compose-ui = { module = "androidx.compose.ui:ui", version = "1.7.3" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" }
Expand All @@ -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" }
Expand Down
8 changes: 8 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ pluginManagement {
}
}

dependencyResolutionManagement {
repositories {
mavenCentral()
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev/")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev/")

What is this for? 1.7.0-rc01 is on Maven Central and the Android variants are all on Google's Maven repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It resolves the "Could not find org.jetbrains.compose.compiler:compiler:1.5.15."
"1.5.15" version is published to the compose repository only
https://mvnrepository.com/artifact/org.jetbrains.compose.compiler/compiler?repo=space-public-compose-dev

}
}

include(":paging-common")
include(":paging-compose-common")
include(":paging-runtime-uikit")
Expand Down