Merge pull request #706 from Splitties/main

Prepare for release 0.60.3
Splitties · Sep 27, 2023 · eb0221a · eb0221a
2 parents 15204aa + ac75e67
commit eb0221a
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change log for refreshVersions
 
+## Version 0.60.3 (2023-09-27)
+
+### Bug fix
+
+Fix a bug where version keys would be marked as unused in some projects.
+
+### New dependency notations
+
+<details>
+<summary><strong>Click to expand (18) </strong></summary>
+
+- `AndroidX.bluetooth`
+- `AndroidX.bluetooth.testing`
+</details>
+
+
 ## Version 0.60.2 (2023-08-29)
 
 ### Bug fix

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 // settings.gradle(.kts)
 plugins {
     // See https://splitties.github.io/refreshVersions
-    id("de.fayard.refreshVersions") version "0.60.2"
+    id("de.fayard.refreshVersions") version "0.60.3"
 }
 
 refreshVersions { // Optional: configure the plugin

diff --git a/docs/dependency-notations.md b/docs/dependency-notations.md
@@ -3,7 +3,7 @@ title: Built-in Dependency Notations
 ---
 # Built-in Dependency Notations
 
-[**refreshVersions**](https://github.com/Splitties/refreshVersions) provides **1254** Dependency Notations in **26** groups and **263** subgroups
+[**refreshVersions**](https://github.com/Splitties/refreshVersions) provides **1256** Dependency Notations in **26** groups and **264** subgroups
 
 **Built-in Dependency Notations** are maven coordinates of popular libraries,
 discoverable as for example `KotlinX.coroutines.core` in IntelliJ IDEA,
@@ -126,6 +126,12 @@ Hover 🐁 on a dependency notation to see its `Triple(KotlinName, MavenCoordina
             biometric
         </span>
         - 
+        <span
+            title="AndroidX.bluetooth&#10;androidx.bluetooth:bluetooth:_&#10;version.androidx.bluetooth"
+            style="text-decoration: underline;">
+            bluetooth
+        </span>
+        - 
         <span
             title="AndroidX.browser&#10;androidx.browser:browser:_&#10;version.androidx.browser"
             style="text-decoration: underline;">
@@ -602,6 +608,15 @@ Hover 🐁 on a dependency notation to see its `Triple(KotlinName, MavenCoordina
             
     </td></tr>
             
+    <tr><td><b>AndroidX.bluetooth</b></td><td>
+        <span
+            title="AndroidX.bluetooth.testing&#10;androidx.bluetooth:bluetooth-testing:_&#10;version.androidx.bluetooth"
+            style="text-decoration: underline;">
+            testing
+        </span>
+            
+    </td></tr>
+            
     <tr><td><b>AndroidX.camera</b></td><td>
         <span
             title="AndroidX.camera.camera2&#10;androidx.camera:camera-camera2:_&#10;version.androidx.camera"

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -20,9 +20,9 @@ extra:
     gradlePluginPortal: https://plugins.gradle.org/plugin/de.fayard.refreshVersions
     slack: https://app.slack.com/client/T09229ZC6/CP5659EL9
   version:
-    gradle: 8.2.1
-    refreshVersions: '0.60.2'
-    snapshot: '0.60.3-SNAPSHOT'
+    gradle: 8.3
+    refreshVersions: '0.60.3'
+    snapshot: '0.60.4-SNAPSHOT'
   keyboard_shortcuts:
     find_actions: <kbd>ctrl</kbd>/<kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>A</kbd>
 

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
@@ -199,7 +199,8 @@ open class RefreshVersionsTask : DefaultTask() {
             logger.warn("Found ${dependenciesWithHardcodedVersions.count()} dependencies that might have hardcoded versions:")
             warnFor.forEach { logger.warn("- $it") }
             if (logger.isInfoEnabled.not()) {
-                logger.warn("- ${dependenciesWithHardcodedVersions.size - warnFor.size} more... (run with --info to see them all)")
+                val howManyMore = dependenciesWithHardcodedVersions.size - warnFor.size
+                if (howManyMore > 0) logger.warn("- $howManyMore more... (run with --info to see them all)")
             }
             logger.warn("")
             logger.warn(

diff --git a/...c/main/kotlin/de/fayard/refreshVersions/core/internal/dependencies/DependenciesTracker.kt b/...c/main/kotlin/de/fayard/refreshVersions/core/internal/dependencies/DependenciesTracker.kt
@@ -10,6 +10,7 @@ import de.fayard.refreshVersions.core.internal.forNpm
 import de.fayard.refreshVersions.core.internal.withGlobalRepos
 import de.fayard.refreshVersions.core.internal.withPluginsRepos
 import okhttp3.OkHttpClient
+import org.gradle.api.InvalidUserCodeException
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
@@ -34,7 +35,15 @@ internal class DependenciesTracker {
         // See https://kotlinlang.org/docs/js-project-setup.html#additional-yarn-features-yarnrc
         // and https://yarnpkg.com/getting-started/migration#update-your-configuration-to-the-new-settings
         // and also https://yarnpkg.com/configuration/yarnrc#npmRegistryServer
-        rootProject.allprojects { recordBuildscriptAndRegularDependencies(npmRegistries) }
+        rootProject.allprojects {
+            try {
+                afterEvaluate {
+                    recordBuildscriptAndRegularDependencies(npmRegistries)
+                }
+            } catch (e: InvalidUserCodeException) {
+                recordBuildscriptAndRegularDependencies(npmRegistries)
+            }
+        }
     }
 
     private fun Project.recordBuildscriptAndRegularDependencies(npmRegistries: List<String>) {

diff --git a/plugins/dependencies/src/main/kotlin/dependencies/AndroidX.kt b/plugins/dependencies/src/main/kotlin/dependencies/AndroidX.kt
@@ -16,7 +16,7 @@ import org.gradle.kotlin.dsl.IsNotADependency
  * - Back in 2019 November the 18th, AndroidX was made of **187 artifacts**.
  */
 object AndroidX : IsNotADependency {
-    // Last AndroidX Update sync: Jul 26, 2023.
+    // Last AndroidX Update sync: Sep 20, 2023.
     // See https://androidx.tech/blog/updates for easier updates tracking
     // LibraryGroups.kt: https://github.com/androidx/androidx/blob/androidx-main/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
     // LibraryVersions.kt: https://github.com/androidx/androidx/blob/androidx-main/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -314,6 +314,24 @@ object AndroidX : IsNotADependency {
         val ktx = module("biometric-ktx")
     }
 
+    /**
+     * AndroidX Bluetooth Library.
+     *
+     * [Release notes](https://developer.android.com/jetpack/androidx/releases/bluetooth)
+     *
+     * ### API reference:
+     * - [androidx.bluetooth](https://developer.android.com/reference/kotlin/androidx/bluetooth/package-summary)
+     */
+    val bluetooth = Bluetooth
+
+    object Bluetooth : DependencyNotationAndGroup(
+        group = "androidx.bluetooth",
+        name = "bluetooth"
+    ) {
+        /** Test utilities for AndroidX Bluetooth */
+        val testing = module("bluetooth-testing")
+    }
+
     /**
      * Android Support Custom Tabs.
      *

diff --git a/plugins/dependencies/src/main/resources/version-to-removals-revision-mapping.txt b/plugins/dependencies/src/main/resources/version-to-removals-revision-mapping.txt
@@ -12,3 +12,4 @@
 0.60.0->16
 0.60.1->17
 0.60.2->19
+0.60.3->19
diff --git a/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt b/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt
@@ -28,6 +28,8 @@ androidx.benchmark:benchmark-macro
 androidx.benchmark:benchmark-macro-junit4
 androidx.biometric:biometric
 androidx.biometric:biometric-ktx
+androidx.bluetooth:bluetooth
+androidx.bluetooth:bluetooth-testing
 androidx.browser:browser
 androidx.camera:camera-camera2
 androidx.camera:camera-core

diff --git a/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt b/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt
@@ -29,6 +29,8 @@ androidx.benchmark..benchmark-macro-junit4=AndroidX.benchmark.macroJunit4
 androidx.benchmark..benchmark-macro=AndroidX.benchmark.macro
 androidx.biometric..biometric-ktx=AndroidX.biometric.ktx
 androidx.biometric..biometric=AndroidX.biometric
+androidx.bluetooth..bluetooth-testing=AndroidX.bluetooth.testing
+androidx.bluetooth..bluetooth=AndroidX.bluetooth
 androidx.browser..browser=AndroidX.browser
 androidx.camera..camera-camera2=AndroidX.camera.camera2
 androidx.camera..camera-core=AndroidX.camera.core

diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt
@@ -28,6 +28,8 @@ androidx.benchmark..benchmark-macro-junit4=version.androidx.benchmark
 androidx.benchmark..benchmark-macro=version.androidx.benchmark
 androidx.biometric..biometric-ktx=version.androidx.biometric-ktx
 androidx.biometric..biometric=version.androidx.biometric
+androidx.bluetooth..bluetooth-testing=version.androidx.bluetooth
+androidx.bluetooth..bluetooth=version.androidx.bluetooth
 androidx.browser..browser=version.androidx.browser
 androidx.camera..camera-camera2=version.androidx.camera
 androidx.camera..camera-core=version.androidx.camera

diff --git a/plugins/version.txt b/plugins/version.txt
@@ -1 +1 @@
-0.60.2
+0.60.3