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

Update Version Catalog #96

Merged
merged 4 commits into from
May 29, 2024
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
4 changes: 1 addition & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ plugins {
jacoco
alias(libs.plugins.firebase.perf.plugin)
alias(libs.plugins.about.lib.plugin)
alias(libs.plugins.compose.compiler)
}

jacoco {
Expand Down Expand Up @@ -161,9 +162,6 @@ android {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.9"
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ plugins {
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.about.lib.plugin) apply false
alias(libs.plugins.firebase.perf.plugin) apply false
alias(libs.plugins.compose.compiler) apply false
// TODO Move some of these to toml file
id("com.github.ben-manes.versions") version "0.41.0"
id("nl.littlerobots.version-catalog-update") version "0.8.4"
Expand All @@ -30,7 +31,7 @@ buildscript {

versionCatalogUpdate {
pin {
versions.addAll("kotlin-android", "kotlin-serialization", "kotlin", "crashlytics-plugin")
versions.addAll("kotlin-android", "crashlytics-plugin")
}
}

Expand Down
23 changes: 12 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
about-lib = "11.1.4"
about-lib = "11.2.0"
activity-compose = "1.9.0"
android-gradle-plugin = "8.4.0"
android-gradle-plugin = "8.4.1"
androidx-test-rules = "1.5.0"
androidx-test-runner = "1.5.2"
chucker = "4.0.0"
Expand All @@ -13,8 +13,8 @@ compose-material3 = "1.2.1"
compose-navigation = "2.7.7"
core-ktx = "1.5.0"
core-ktx-version = "1.13.1"
coroutines = "1.8.0"
coroutines-test = "1.8.0"
coroutines = "1.8.1"
coroutines-test = "1.8.1"
crashlytics-plugin = "2.9.9"
datastore = "1.1.1"
firebase-bom = "33.0.0"
Expand All @@ -23,16 +23,16 @@ hilt = "2.51.1"
hilt-nav-compose = "1.2.0"
inappupdate = "2.1.0"
junit = "4.13.2"
kotlin = "1.9.22"
kotlin-serialization = "1.9.22"
kotlinx-coroutines-android = "1.8.0"
kotlinx-serialization = "1.6.3"
kotlin = "2.0.0"
kotlin-serialization = "2.0.0"
kotlinx-coroutines-android = "1.8.1"
kotlinx-serialization = "1.7.0-RC"
kotlinx-serialization-converter = "1.0.0"
leakcanary = "2.14"
lifecycle-runtime-ktx = "2.8.0-rc01"
lifecycle-viewmodel-compose = "2.8.0-rc01"
lifecycle-runtime-ktx = "2.8.0"
lifecycle-viewmodel-compose = "2.8.0"
mapsplatform-secrets = "2.0.1"
mockk = "1.13.10"
mockk = "1.13.11"
okhttp = "4.12.0"
play-services-location = "21.2.0"
retrofit = "2.11.0"
Expand Down Expand Up @@ -99,6 +99,7 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
mapsplatform-secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "mapsplatform-secrets" }
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-serialization" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

[bundles]
android-test = [
Expand Down
Loading