diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c42d89d73..5466fd9ec 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,24 +1,27 @@ - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/gradle-conventions-settings/settings.gradle.kts b/gradle-conventions-settings/settings.gradle.kts index c9dab5899..8826a99fc 100644 --- a/gradle-conventions-settings/settings.gradle.kts +++ b/gradle-conventions-settings/settings.gradle.kts @@ -4,7 +4,7 @@ plugins { // Keep it in sync with libs.versions.toml - id("com.gradle.develocity") version "3.19.2" + id("com.gradle.develocity") version "4.2" } rootProject.name = "gradle-conventions-settings" diff --git a/gradle-conventions/src/main/kotlin/util/apiValidation.kt b/gradle-conventions/src/main/kotlin/util/apiValidation.kt index 83b56a064..afe0d3772 100644 --- a/gradle-conventions/src/main/kotlin/util/apiValidation.kt +++ b/gradle-conventions/src/main/kotlin/util/apiValidation.kt @@ -20,6 +20,7 @@ val Project.enableAbiValidation get() = name !in excludedProjects @OptIn(ExperimentalAbiValidation::class) fun AbiValidationVariantSpec.configureAbiFilters() { filters { + @Suppress("DEPRECATION_ERROR") // todo: temp, remove after update to 2.3.20 excluded { annotatedWith.add("kotlinx.rpc.internal.utils.InternalRpcApi") byNames.add("kotlinx.rpc.internal.**") diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml index 4f44ea24a..ddcba7ee4 100644 --- a/versions-root/libs.versions.toml +++ b/versions-root/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # core library version -kotlinx-rpc = "0.10.1" +kotlinx-rpc = "0.11.0-SNAPSHOT" # kotlin kotlin-lang = "2.2.21" # or env.KOTLIN_VERSION @@ -25,7 +25,7 @@ atomicfu = "0.29.0" serialization = "1.9.0" detekt-gradle-plugin = "1.23.8" kover = "0.9.2" -develocity = "3.19.2" +develocity = "4.2" common-custom-user-data = "2.4.0" compat-patrouille = "0.0.2" lincheck = "3.2"