merge conflict

JuulLabs · Feb 4, 2025 · 9cc80eb · 9cc80eb
2 parents 5907d5e + b76b21e
commit 9cc80eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-jso
 [plugins]
 android-library = { id = "com.android.library", version = "8.8.0" }
 api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "2.1.0" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "2.1.10" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "5.0.1" }
 maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
 swiftpackage = { id = "io.github.luca992.multiplatform-swiftpackage", version = "2.2.3" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME