From 08f7bc3e433c5f31043f50d40113bf1742032e0f Mon Sep 17 00:00:00 2001 From: Matthew Zavislak <1291596+elevenfive@users.noreply.github.com> Date: Wed, 22 Jan 2025 12:57:48 -0800 Subject: [PATCH] Fix CME, update dependencies - See: https://github.com/ben-manes/gradle-versions-plugin/issues/907 --- .../benmanes/gradle/versions/updates/DependencyUpdates.kt | 8 ++------ gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/DependencyUpdates.kt b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/DependencyUpdates.kt index cab65272b..bb11f184c 100644 --- a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/DependencyUpdates.kt +++ b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/DependencyUpdates.kt @@ -41,13 +41,13 @@ class DependencyUpdates fun run(): DependencyUpdatesReporter { val projectConfigs = project.allprojects - .associateBy({ it }, { it.configurations.matching(filterConfigurations).toLinkedHashSet() }) + .associateBy({ it }, { it.configurations.matching(filterConfigurations) }) val status: Set = resolveProjects(projectConfigs, checkConstraints) val buildscriptProjectConfigs = project.allprojects - .associateBy({ it }, { it.buildscript.configurations.toLinkedHashSet() }) + .associateBy({ it }, { it.buildscript.configurations }) val buildscriptStatus: Set = resolveProjects( buildscriptProjectConfigs, @@ -177,7 +177,3 @@ class DependencyUpdates } } } - -private fun Collection.toLinkedHashSet(): LinkedHashSet { - return toCollection(LinkedHashSet(this.size)) -} diff --git a/gradle.properties b/gradle.properties index bb8f63e54..ad6d3c85f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.github.ben-manes -VERSION_NAME=0.51.0 +VERSION_NAME=0.52.0 POM_URL=https://github.com/ben-manes/gradle-versions-plugin POM_SCM_URL=https://github.com/ben-manes/gradle-versions-plugin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 347a9a690..e50e05e9c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.0.21" +kotlin = "2.1.0" [plugins] dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } @@ -11,6 +11,6 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } [libraries] kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -moshi = { module = "com.squareup.moshi:moshi-kotlin", version = "1.12.0" } +moshi = { module = "com.squareup.moshi:moshi-kotlin", version = "1.15.2" } okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" } spock = { module = "org.spockframework:spock-junit4", version = "2.4-M4-groovy-3.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..e0fd02028 100644 --- 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME