Merge pull request #712 from Splitties/main

Prepare for release 0.60.4

.github/workflows/check-build.yml

@@ -84,6 +84,10 @@ on:
       - '!docs/**'
 jobs:
   check-all:
+    env:
+      GPG_key_id: ${{ secrets.GPG_KEY_ID }}
+      GPG_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+      GPG_private_password: ${{ secrets.GPG_PRIVATE_PASSWORD }}
     runs-on: ${{ github.event.inputs.run-on || 'ubuntu-latest' }}
     steps:
       - name: "Enable long paths for git Windows"

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log for refreshVersions
 
+## Version 0.60.4 (2024-01-31)
+
+### Potentially breaking change
+
+We now support only Gradle 8+. Use Gradle 8+ or stick to version 0.60.3 if you can't yet.
+
+### Bug fix
+
+Update the priority of artifact version key rules so that the longest match takes precedence, rather than the final key length.
+That should fix the keys of `androidx.wear.compose` libraries.
+
+
 ## Version 0.60.3 (2023-09-27)
 
 ### Bug fix

README.md

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

docs/dependency-notations.md

@@ -2401,31 +2401,31 @@ Hover 🐁 on a dependency notation to see its `Triple(KotlinName, MavenCoordina
             
     <tr><td><b>AndroidX.wear.compose</b></td><td>
         <span
-            title="AndroidX.wear.compose.foundation&#10;androidx.wear.compose:compose-foundation:_&#10;version.androidx.wear.compose.compose-foundation"
+            title="AndroidX.wear.compose.foundation&#10;androidx.wear.compose:compose-foundation:_&#10;version.androidx.wear.compose"
             style="text-decoration: underline;">
             foundation
         </span>
         - 
         <span
-            title="AndroidX.wear.compose.material3&#10;androidx.wear.compose:compose-material3:_&#10;version.androidx.wear.compose.compose-material3"
+            title="AndroidX.wear.compose.material3&#10;androidx.wear.compose:compose-material3:_&#10;version.androidx.wear.compose"
             style="text-decoration: underline;">
             material3
         </span>
         - 
         <span
-            title="AndroidX.wear.compose.material&#10;androidx.wear.compose:compose-material:_&#10;version.androidx.wear.compose.compose-material"
+            title="AndroidX.wear.compose.material&#10;androidx.wear.compose:compose-material:_&#10;version.androidx.wear.compose"
             style="text-decoration: underline;">
             material
         </span>
         - 
         <span
-            title="AndroidX.wear.compose.navigation&#10;androidx.wear.compose:compose-navigation:_&#10;version.androidx.wear.compose.compose-navigation"
+            title="AndroidX.wear.compose.navigation&#10;androidx.wear.compose:compose-navigation:_&#10;version.androidx.wear.compose"
             style="text-decoration: underline;">
             navigation
         </span>
         - 
         <span
-            title="AndroidX.wear.compose.uiTooling&#10;androidx.wear.compose:compose-ui-tooling:_&#10;version.androidx.wear.compose.compose-ui-tooling"
+            title="AndroidX.wear.compose.uiTooling&#10;androidx.wear.compose:compose-ui-tooling:_&#10;version.androidx.wear.compose"
             style="text-decoration: underline;">
             uiTooling
         </span>

docs/requirements.txt

@@ -1,21 +1,38 @@
-click==8.1.3
+mkdocs-material==9.5.6
+
+# Dependencies of mkdocs-material:
+Markdown==3.5.2
+pymdown-extensions==10.7
+regex==2023.12.25
+Babel==2.14.0
+Jinja2==3.1.3
+mkdocs==1.5.3
+requests==2.31.0
+Pygments==2.17.2
+colorama==0.4.6
+paginate==0.5.6
+mkdocs-material-extensions==1.3.1
+
+# A plugin:
+
+mkdocs-markdownextradata-plugin==0.2.5
+
+# Transitive dependencies
+
+MarkupSafe==2.1.4
+certifi==2023.11.17
+charset-normalizer==3.3.2
+click==8.1.7
 ghp-import==2.1.0
-importlib-metadata==4.11.4
-Jinja2==3.1.2
-Markdown==3.3.7
-MarkupSafe==2.1.1
+idna==3.6
+importlib-metadata==7.0.1
 mergedeep==1.3.4
-mkdocs==1.3.0
-mkdocs-markdownextradata-plugin==0.2.5
-mkdocs-material==8.2.16
-mkdocs-material-extensions==1.0.3
-packaging==21.3
-Pygments==2.12.0
-pymdown-extensions==9.4
-pyparsing==3.0.9
+packaging==23.2
+pathspec==0.12.1
+platformdirs==4.1.0
 python-dateutil==2.8.2
-PyYAML==6.0
+PyYAML==6.0.1
 pyyaml_env_tag==0.1
-six==1.16.0
-watchdog==2.1.8
-zipp==3.8.0
+urllib3==2.2.0
+watchdog==3.0.0
+zipp==3.17.0

docs/setup.md

@@ -4,7 +4,8 @@ This guide will help you set up refreshVersions in a Gradle project.
 
 ## Update Gradle (if needed)
 
-Gradle 6.8+ is required because this plugin relies on Kotlin 1.4.
+Gradle 8+ is required because this plugin relies on Kotlin 1.8.
+That said, the version 0.60.3 of refreshVersions supports Gradle 6.8 to 7.x, in case you need to upgrade Gradle later.
 
 Updating Gradle is anyway usually a good idea. You get fewer bugs, more
 features, and faster builds.

mkdocs.yml

@@ -20,13 +20,13 @@ extra:
     gradlePluginPortal: https://plugins.gradle.org/plugin/de.fayard.refreshVersions
     slack: https://app.slack.com/client/T09229ZC6/CP5659EL9
   version:
-    gradle: 8.4
-    refreshVersions: '0.60.3'
-    snapshot: '0.60.4-SNAPSHOT'
+    gradle: 8.5
+    refreshVersions: '0.60.4'
+    snapshot: '0.60.5-SNAPSHOT'
   keyboard_shortcuts:
     find_actions: <kbd>ctrl</kbd>/<kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>A</kbd>
 
-copyright: 'Copyright &copy; 2020-2023 jmfayard - Louis CAD'
+copyright: 'Copyright &copy; 2020-2024 jmfayard - Louis CAD'
 
 theme:
   name: 'material'

plugins/build.gradle.kts

@@ -1,5 +1,5 @@
-allprojects {
-    repositories {
-        mavenCentral()
-    }
+plugins {
+    // Defined in convention-plugins (includedBuild).
+    // Added here to see updates in versions.properties.
+    id("com.gradle.plugin-publish") apply false
 }

plugins/buildSrcLibs/build.gradle.kts

@@ -1,10 +1,7 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
-    id("com.gradle.plugin-publish")
-    `java-gradle-plugin`
-    `maven-publish`
-    signing
+    id("gradle-plugin")
     `kotlin-dsl`
 }
 
@@ -15,30 +12,12 @@ gradlePlugin {
             displayName = "Dependency notation generator & updates"
             description = "Generates dependency notations constants in buildSrc and " +
                     "updates the versions with gradle refreshVersions"
+            tags = listOf("dependencies", "versions", "buildSrc", "kotlin", "kotlin-dsl")
             implementationClass = "de.fayard.buildSrcLibs.BuildSrcLibsPlugin"
         }
     }
 }
 
-pluginBundle {
-    website = "https://jmfayard.github.io/refreshVersions"
-    vcsUrl = "https://github.com/jmfayard/refreshVersions"
-    tags = listOf("dependencies", "versions", "buildSrc", "kotlin", "kotlin-dsl")
-}
-
-signing {
-    useInMemoryPgpKeys(
-        propertyOrEnvOrNull("GPG_key_id"),
-        propertyOrEnvOrNull("GPG_private_key") ?: return@signing,
-        propertyOrEnv("GPG_private_password")
-    )
-    sign(publishing.publications)
-}
-
-publishing {
-    setupAllPublications(project)
-}
-
 dependencies {
 
     api(project(":refreshVersions-core"))
@@ -60,20 +39,14 @@ dependencies {
 }
 
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-Xopt-in=kotlin.RequiresOptIn",
-        "-Xopt-in=de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi"
-    )
+kotlin {
+    jvmToolchain(8)
+    compilerOptions {
+        apiVersion = KotlinVersion.KOTLIN_1_8 // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
+        freeCompilerArgs.add("-opt-in=de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi")
+    }
 }
 
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 }
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    withSourcesJar()
-}

plugins/convention-plugins/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    `kotlin-dsl`
+}
+
+fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
+
+dependencies {
+    implementation(plugin(id = "com.gradle.plugin-publish", version = "_"))
+}

plugins/convention-plugins/settings.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    id("de.fayard.refreshVersions") version "0.60.3"
+}
+
+dependencyResolutionManagement {
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+refreshVersions {
+    versionsPropertiesFile = rootDir.parentFile.resolve("versions.properties")
+}

plugins/buildSrc/src/main/kotlin/PropertyOrEnv.kt → plugins/convention-plugins/src/main/kotlin/PropertyOrEnv.kt

@@ -1,11 +1,11 @@
 import org.gradle.api.Project
 
-fun Project.propertyOrEnv(key: String): String {
+internal fun Project.propertyOrEnv(key: String): String {
     return findProperty(key) as String?
         ?: System.getenv(key)
         ?: error("Didn't find any value for the key \"$key\" in Project properties or environment variables.")
 }
 
-fun Project.propertyOrEnvOrNull(key: String): String? {
+internal fun Project.propertyOrEnvOrNull(key: String): String? {
     return findProperty(key) as String? ?: System.getenv(key)
 }

plugins/convention-plugins/src/main/kotlin/gradle-plugin.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+    id("com.gradle.plugin-publish")
+    signing
+}
+
+signing {
+    useInMemoryPgpKeys(
+        propertyOrEnvOrNull("GPG_key_id"),
+        propertyOrEnvOrNull("GPG_private_key") ?: return@signing,
+        propertyOrEnv("GPG_private_password")
+    )
+    sign(publishing.publications)
+}
+
+gradlePlugin {
+    website = Publishing.siteUrl
+    vcsUrl = Publishing.repoUrl
+}
+
+publishing {
+    setupAllPublications(project)
+}