Merge pull request #21 from ahmedre/update_deps

Update dependencies
ahmedre · Jan 18, 2024 · 7d39154 · 7d39154
2 parents d9e02bc + 5f64e5e
commit 7d39154
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/build-logic/convention/src/main/kotlin/convention.spotless.gradle.kts b/build-logic/convention/src/main/kotlin/convention.spotless.gradle.kts
@@ -13,20 +13,20 @@ allprojects {
         extensions.configure<SpotlessExtension> {
             kotlin {
                 target("**/*.kt")
-                targetExclude("${layout.buildDirectory}/**/*.kt", "**/copyright.kt", "**/build/**")
+                targetExclude("${layout.buildDirectory}/**/*.kt", "**/copyright.kt", "**/build/**", "**/.idea/**")
                 licenseHeaderFile(rootProject.file("$rootDir/spotless/copyright.kt"))
                 trimTrailingWhitespace()
                 endWithNewline()
             }
             format("kts") {
                 target("**/*.kts")
-                targetExclude("${layout.buildDirectory}/**/*.kts", "**/copyright.kts", "**/build/**")
+                targetExclude("${layout.buildDirectory}/**/*.kts", "**/copyright.kts", "**/build/**", "**/.idea/**")
                 // Look for the first line that doesn't have a block comment (assumed to be the license)
                 licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
             }
             format("xml") {
                 target("**/*.xml")
-                targetExclude("**/build/**/*.xml", "**/copyright.xml", "**/build/**")
+                targetExclude("**/build/**/*.xml", "**/copyright.xml", "**/build/**", "**/.idea/**")
                 // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
                 licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
             }

diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -12,8 +12,8 @@ plugins {
 }
 
 compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.0")
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
+    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22")
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)

diff --git a/design/build.gradle.kts b/design/build.gradle.kts
@@ -11,8 +11,8 @@ plugins {
 }
 
 compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.0")
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
+    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22")
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
-activity-compose = "1.7.2"
-agp = "8.3.0-alpha04"
-androidx-material = "1.5.0"
+activity-compose = "1.8.2"
+agp = "8.2.1"
+androidx-material = "1.5.4"
 coil-compose = "2.4.0"
-foundation = "1.5.0"
-kotlin = "1.9.10"
-core-ktx = "1.10.1"
+foundation = "1.5.4"
+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"
 kotlinx-serialization = "1.6.0"
-ktor = "2.3.4"
-material = "1.9.0"
-compose = "1.5.0"
-lifecycle-runtime-ktx = "2.6.1"
-compose-bom = "2023.08.00"
-compose-compiler = "1.5.2"
-compose-jb = "1.5.0"
+ktor = "2.3.7"
+material = "1.11.0"
+compose = "1.5.4"
+lifecycle-runtime-ktx = "2.7.0"
+compose-bom = "2023.10.01"
+compose-compiler = "1.5.8"
+compose-jb = "1.5.11"
 spotless = "6.14.0"
 
 [libraries]
@@ -35,7 +35,7 @@ androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling
 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.1"
+androidx-navigation-compose = "androidx.navigation:navigation-compose:2.7.6"
 
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }

diff --git 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sdui/build.gradle.kts b/sdui/build.gradle.kts
@@ -12,8 +12,8 @@ plugins {
 }
 
 compose {
-    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.0")
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
+    kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.21")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.22")
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)