Merge pull request #689 from Vampire/fix-reject-version-if

Fix rejectVersionsIf vs. rejectVersionIf
Splitties · Jul 6, 2023 · 77e4c0d · 77e4c0d
2 parents 438fa08 + 8878121
commit 77e4c0d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -718,7 +718,7 @@ Look for [issues with the `Dependency notations` and `up-for-grabs` tags](https:
 ### New features
 
 - refreshVersions will now add `## unused` comments on top of unused entries in the `versions.properties` file after you run the `refreshVersions` task, so you know which ones are obsolete and can be removed.
-- The new `rejectVersionsIf { … }` predicate available in the `refreshVersions { … }` extension in your `settings.gradle[.kts]` file will allow you to filter any kind of versions you don't want to know about. It can be handy to filter snapshots out for example.
+- The new `rejectVersionIf { … }` predicate available in the `refreshVersions { … }` extension in your `settings.gradle[.kts]` file will allow you to filter any kind of versions you don't want to know about. It can be handy to filter snapshots out for example.
 - Most of our dependency notations now provide more flexibility with 3 new extension functions: `withVersionPlaceholder()`, `withVersion(…)`, and `withoutVersion()`.
 
 ### Change (potentially breaking)

diff --git a/docs/update-dependencies.md b/docs/update-dependencies.md
@@ -114,7 +114,7 @@ A perhaps better approach is to display development versions only if you are alr
  }
  ```
 
-`rejectVersionsIf { ...}` is pretty flexible, you can also use it to ban versions from specific version keys:
+`rejectVersionIf { ...}` is pretty flexible, you can also use it to ban versions from specific version keys:
 
 === "settings.gradle.kts"
  ```kotlin

diff --git a/plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsTask.kt b/plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsTask.kt
@@ -121,7 +121,7 @@ open class RefreshVersionsTask : DefaultTask() {
 
  private fun warnAboutRefreshVersionsIfSettingIfAny() {
  if (RefreshVersionsConfigHolder.isUsingVersionRejection) {
- logger.warn("NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.")
+ logger.warn("NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.")
  }
  }
 

diff --git a/...c/main/kotlin/de/fayard/refreshVersions/core/internal/versions/VersionsPropertiesModel.kt b/...c/main/kotlin/de/fayard/refreshVersions/core/internal/versions/VersionsPropertiesModel.kt
@@ -104,7 +104,7 @@ internal actual data class VersionsPropertiesModel(
 
  val isUsingVersionRejectionHeader = """
  |####
- |#### NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.
+ |#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.
  """.trimMargin()
 
  private fun String.mustBeACommentLine() {

diff --git a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt
@@ -107,3 +107,4 @@ androidx.health..health-connect-client=version.androidx.health-connect-client
 com.google.accompanist..accompanist-glide=version.google.accompanist
 com.google.accompanist..accompanist-imageloading-core=version.google.accompanist
 app.cash.molecule..molecule-testing=version.app.cash.molecule
+androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime
diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt
@@ -58,7 +58,7 @@ androidx.compose.runtime..runtime-livedata=version.androidx.compose.runtime
 androidx.compose.runtime..runtime-rxjava2=version.androidx.compose.runtime
 androidx.compose.runtime..runtime-rxjava3=version.androidx.compose.runtime
 androidx.compose.runtime..runtime-saveable=version.androidx.compose.runtime
-androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime
+androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime-tracing
 androidx.compose.runtime..runtime=version.androidx.compose.runtime
 androidx.compose.ui..ui-geometry=version.androidx.compose.ui
 androidx.compose.ui..ui-graphics=version.androidx.compose.ui

diff --git a/sample-groovy/versions.properties b/sample-groovy/versions.properties
@@ -8,7 +8,7 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 ####
-#### NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.
+#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.
 
 plugin.org.gradle.hello-world=0.2
 

diff --git a/sample-kotlin-js/versions.properties b/sample-kotlin-js/versions.properties
@@ -8,7 +8,7 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 ####
-#### NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.
+#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.
 
 version.kotest=5.4.0
 

diff --git a/sample-kotlin/versions.properties b/sample-kotlin/versions.properties
@@ -8,7 +8,7 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 ####
-#### NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.
+#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.
 
 plugin.org.jetbrains.kotlinx.benchmark=0.4.2