From a736483f8df23a8db7b404a1aed4e225065d3710 Mon Sep 17 00:00:00 2001 From: Ahmed El-Helw Date: Sat, 11 May 2024 00:06:35 +0400 Subject: [PATCH] Update dependencies --- build-logic/convention/build.gradle.kts | 2 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- catalog/build.gradle.kts | 2 +- design/build.gradle.kts | 2 +- gradle/libs.versions.toml | 38 ++++--------------- gradle/wrapper/gradle-wrapper.properties | 2 +- sdui/build.gradle.kts | 2 +- 7 files changed, 12 insertions(+), 38 deletions(-) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index ccfc064..af78e3b 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { `kotlin-dsl` } @@ -25,7 +24,6 @@ tasks.withType().configureEach { } dependencies { -// compileOnly(libs.gradle.android) compileOnly(libs.gradle.spotless) compileOnly(libs.gradle.kotlin) } \ No newline at end of file diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties index 1b298ae..a8382d7 100644 --- a/build-logic/gradle/wrapper/gradle-wrapper.properties +++ b/build-logic/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts index 3e74167..c85a6eb 100644 --- a/catalog/build.gradle.kts +++ b/catalog/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get()) } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) diff --git a/design/build.gradle.kts b/design/build.gradle.kts index 7ddbe50..0a2c4f0 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get()) } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 775bba4..6087aee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,18 @@ [versions] -activity-compose = "1.8.2" -agp = "8.3.0" -androidx-material = "1.6.2" +activity-compose = "1.9.0" +agp = "8.4.0" +androidx-material = "1.6.7" coil-compose = "2.4.0" -foundation = "1.6.2" -kotlin = "1.9.22" -core-ktx = "1.12.0" -junit = "4.13.2" -androidx-test-ext-junit = "1.1.5" -espresso-core = "3.5.1" -appcompat = "1.6.1" +foundation = "1.6.7" +kotlin = "1.9.23" kotlinx-serialization = "1.6.3" ktor = "2.3.8" -material = "1.11.0" -lifecycle-runtime-ktx = "2.7.0" -compose-bom = "2024.02.01" -compose-compiler = "1.5.10" -compose-jb = "1.6.0" +compose-compiler = "1.5.13" +compose-jb = "1.6.1" spotless = "6.14.0" [libraries] # Dependencies of the included build-logic -gradle-android = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } gradle-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } gradle-spotless = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" } @@ -31,8 +22,6 @@ androidx-compose-material = { module = "androidx.compose.material:material", ver androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" } -androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } androidx-navigation-compose = "androidx.navigation:navigation-compose:2.7.7" @@ -43,22 +32,9 @@ ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotia ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } -appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } - -junit = { group = "junit", name = "junit", version.ref = "junit" } -espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } - coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } -lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" } -compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } -ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -material3 = { group = "androidx.compose.material3", name = "material3" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee13b02..6f01aae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Aug 18 19:50:46 GST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sdui/build.gradle.kts b/sdui/build.gradle.kts index 046e98a..61d74fd 100644 --- a/sdui/build.gradle.kts +++ b/sdui/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } compose { - kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.22") + kotlinCompilerPlugin = dependencies.compiler.forKotlin(libs.versions.kotlin.get()) } @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)