Skip to content

Commit

Permalink
Merge pull request #204 from joreilly/dependency_updates
Browse files Browse the repository at this point in the history
dependency updates
  • Loading branch information
joreilly authored Mar 3, 2024
2 parents b8554c3 + 58d83a3 commit 7863932
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 39 deletions.
7 changes: 1 addition & 6 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ kotlin {
implementation(compose.material3)
implementation(compose.components.resources)

implementation("io.github.koalaplot:koalaplot-core:0.5.1")
implementation(libs.koalaplot.core)
implementation(libs.image.loader)
}

Expand All @@ -92,8 +92,3 @@ kotlin {
kotlin.sourceSets.all {
languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
}

compose {
kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler.get())
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.20")
}
5 changes: 0 additions & 5 deletions compose-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,3 @@ dependencies {
application {
mainClass.set("MainKt")
}

compose {
kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.21")
}
30 changes: 16 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
[versions]
kotlin = "1.9.21"
ksp = "1.9.21-1.0.16"
coroutines = "1.8.0-RC2"
kotlinxSerialization = "1.6.2"
kotlin = "1.9.22"
ksp = "1.9.22-1.0.17"
coroutines = "1.8.0"
kotlinxSerialization = "1.6.3"
kotlinxDateTime = "0.5.0"
androidGradlePlugin = "8.2.0"
androidGradlePlugin = "8.2.2"
koalaplot = "0.5.1"
koin = "3.5.3"
koinCompose = "3.5.3"
ktor = "2.3.7"
ktor = "2.3.8"
slf4j = "2.0.9"
realm = "1.13.0"
skie = "0.6.1"

androidxActivity = "1.8.2"
androidxComposeCompiler = "1.5.5-dev-k1.9.21-163bb051fe5"
jbComposeCompiler = "1.5.4"
androidxComposeBom = "2023.10.01"
androidxNavigationCompose = "2.7.6"
androidxLifecycle = "2.6.2"
androidxComposeCompiler = "1.5.8"
jbComposeCompiler = "1.5.8"
androidxComposeBom = "2024.02.01"
androidxNavigationCompose = "2.7.7"
androidxLifecycle = "2.7.0"

composeMultiplatform = "1.5.11"
composeMultiplatform = "1.6.0"
accompanist = "0.32.0"
coilCompose = "2.5.0"
image-loader = "1.7.1"
coilCompose = "2.6.0"
image-loader = "1.7.7"

junit = "4.13.2"

Expand Down Expand Up @@ -61,6 +62,7 @@ androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-co
coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material3", version.ref = "accompanist" }
image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }
koalaplot-core = { module = "io.github.koalaplot:koalaplot-core", version.ref = "koalaplot" }

koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCompose" }
Expand Down
16 changes: 2 additions & 14 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
pluginManagement {
repositories {
google {
mavenContent {
includeGroupByRegex(".*google.*")
includeGroupByRegex(".*android.*")
}
}

google()
mavenCentral()
gradlePluginPortal()
}
}

dependencyResolutionManagement {
repositories {
google {
mavenContent {
includeGroupByRegex(".*google.*")
includeGroupByRegex(".*android.*")
}
}

google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
Expand Down

0 comments on commit 7863932

Please sign in to comment.