Merge pull request #1 from meshtastic/jamesarich/dependency-audit-update

chore: audit and update dependencies, CI actions, and Gradle APIs

Author: jamesarich

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         gradle: ['9.5.1']
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:
@@ -30,7 +30,7 @@ jobs:
 
       - name: Upload test reports
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: test-reports-gradle-${{ matrix.gradle }}
           path: plugin/build/reports/

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:

.github/workflows/snapshot.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - Unreleased
+## [0.1.2] - Unreleased
 
 ### Added
 

README.md

@@ -14,7 +14,7 @@ Apply the settings plugin in `settings.gradle.kts` — it captures every depende
 ```kotlin
 // settings.gradle.kts
 plugins {
-    id("org.meshtastic.flatpak.sources.settings") version "0.1.0"
+    id("org.meshtastic.flatpak.sources.settings") version "0.1.2"
 }
 ```
 
@@ -43,7 +43,7 @@ If your project uses an included build for convention plugins, apply the setting
 ```kotlin
 // build-logic/settings.gradle.kts
 plugins {
-    id("org.meshtastic.flatpak.sources.settings") version "0.1.0"
+    id("org.meshtastic.flatpak.sources.settings") version "0.1.2"
 }
 ```
 

gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
+org.gradle.caching=true
 version=0.1.2

plugin/src/functionalTest/kotlin/org/meshtastic/flatpak/sources/FlatpakSourcesPluginFunctionalTest.kt

@@ -10,13 +10,18 @@ package org.meshtastic.flatpak.sources
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.io.TempDir
 import java.io.File
+import java.nio.file.Path
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class FlatpakSourcesPluginFunctionalTest {
 
+    @TempDir
+    lateinit var tempDir: Path
+
     @Test
     fun `plugin applies successfully and task exists`() {
         val projectDir = createTempProject()
@@ -67,7 +72,7 @@ class FlatpakSourcesPluginFunctionalTest {
 
     @Test
     fun `multi-module project works`() {
-        val projectDir = createTempDir("flatpak-multimodule")
+        val projectDir = tempDir.resolve("multimodule").toFile().apply { mkdirs() }
         File(projectDir, "settings.gradle.kts").writeText(
             """
             rootProject.name = "multi-module-test"
@@ -105,7 +110,7 @@ class FlatpakSourcesPluginFunctionalTest {
 
     @Test
     fun `settings plugin applies project plugin and task exists`() {
-        val projectDir = createTempDir("flatpak-settings")
+        val projectDir = tempDir.resolve("settings").toFile().apply { mkdirs() }
         File(projectDir, "settings.gradle.kts").writeText(
             """
             plugins {
@@ -128,7 +133,7 @@ class FlatpakSourcesPluginFunctionalTest {
 
     @Test
     fun `settings plugin captures URLs without init script warning`() {
-        val projectDir = createTempDir("flatpak-settings-capture")
+        val projectDir = tempDir.resolve("settings-capture").toFile().apply { mkdirs() }
         File(projectDir, "settings.gradle.kts").writeText(
             """
             plugins {
@@ -165,7 +170,7 @@ class FlatpakSourcesPluginFunctionalTest {
 
     @Test
     fun `settings plugin works with included build reuse pattern`() {
-        val projectDir = createTempDir("flatpak-reuse")
+        val projectDir = tempDir.resolve("reuse").toFile().apply { mkdirs() }
         File(projectDir, "settings.gradle.kts").writeText(
             """
             plugins {
@@ -187,7 +192,7 @@ class FlatpakSourcesPluginFunctionalTest {
     }
 
     private fun createTempProject(extraConfig: String = ""): File {
-        val projectDir = createTempDir("flatpak-sources-test")
+        val projectDir = tempDir.resolve("project").toFile().apply { mkdirs() }
         File(projectDir, "settings.gradle.kts").writeText(
             """
             rootProject.name = "test-project"

plugin/src/main/kotlin/org/meshtastic/flatpak/sources/FlatpakSourcesPlugin.kt

@@ -18,7 +18,7 @@ package org.meshtastic.flatpak.sources
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.ModuleVersionIdentifier
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.internal.operations.BuildOperationDescriptor
 import org.gradle.internal.operations.BuildOperationListener
@@ -161,13 +161,14 @@ class FlatpakSourcesPlugin : Plugin<Project> {
                     .filter { !it.startsWith("file:") }
 
             return try {
-                config.resolvedConfiguration.resolvedArtifacts.flatMap { artifact ->
-                    val mid = artifact.moduleVersion.id
+                config.incoming.artifacts.artifacts.flatMap { artifact ->
+                    val componentId = artifact.id.componentIdentifier
+                    if (componentId !is ModuleComponentIdentifier) return@flatMap emptyList()
                     project.logger.lifecycle(
                         "flatpak-sources: force-resolved {} (platform artifact)",
-                        "${mid.group}:${mid.name}:${mid.version}",
+                        "${componentId.group}:${componentId.module}:${componentId.version}",
                     )
-                    artifactToUrls(mid, artifact.file.name, repoUrls)
+                    artifactToUrls(componentId, artifact.file.name, repoUrls)
                 }
             } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
                 project.logger.warn("flatpak-sources: platform resolution failed — {}", e.message)
@@ -176,14 +177,14 @@ class FlatpakSourcesPlugin : Plugin<Project> {
         }
 
         private fun artifactToUrls(
-            mid: ModuleVersionIdentifier,
+            mid: ModuleComponentIdentifier,
             filename: String,
             repoUrls: List<String>,
         ): List<String> {
             val groupPath = mid.group.replace('.', '/')
-            val pomFile = "${mid.name}-${mid.version}.pom"
+            val pomFile = "${mid.module}-${mid.version}.pom"
             return repoUrls.flatMap { repoUrl ->
-                val base = "$repoUrl/$groupPath/${mid.name}/${mid.version}"
+                val base = "$repoUrl/$groupPath/${mid.module}/${mid.version}"
                 buildList {
                     add("$base/$filename")
                     if (filename != pomFile) add("$base/$pomFile")

plugin/src/main/kotlin/org/meshtastic/flatpak/sources/FlatpakSourcesSettingsPlugin.kt

@@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentHashMap
  * ```kotlin
  * // settings.gradle.kts
  * plugins {
- *     id("org.meshtastic.flatpak.sources.settings") version "0.1.0"
+ *     id("org.meshtastic.flatpak.sources.settings") version "0.1.2"
  * }
  * ```
  */

settings.gradle.kts

@@ -11,5 +11,9 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
+
 rootProject.name = "gradle-flatpak-sources"
 include(":plugin")