Constraint foojay-resolver version (GradleUp#946)

SimonMarquis · Jan 14, 2025 · 5e6ab6e · 5e6ab6e
1 parent 82c4557
commit 5e6ab6e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -103,6 +103,8 @@ testing.suites {
       implementation(libs.apache.maven.modelBuilder)
       implementation(libs.moshi)
       implementation(libs.moshi.kotlin)
+      // Used in test `plugins` blocks.
+      implementation(libs.foojayResolver)
     }
   }
 
@@ -126,6 +128,16 @@ gradlePlugin {
   )
 }
 
+tasks.pluginUnderTestMetadata {
+  val functionalTestImplementation = configurations.named("functionalTestImplementation") {
+    isCanBeResolved = true
+  }
+  // Plugins used in tests could be resolved in classpath.
+  pluginClasspath.from(
+    functionalTestImplementation,
+  )
+}
+
 tasks.check {
   dependsOn(
     testing.suites.named("integrationTest"),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,6 +14,7 @@ plexus-xml = "org.codehaus.plexus:plexus-xml:4.0.4"
 xmlunit = "org.xmlunit:xmlunit-legacy:2.10.0"
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
+foojayResolver = "org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.9.0"
 
 pluginPublish = "com.gradle.publish:plugin-publish-plugin:1.3.0"
 mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.30.0"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -38,6 +38,7 @@ dependencyResolutionManagement {
         includeGroupAndSubgroups("com.google")
       }
     }
+    gradlePluginPortal()
   }
 }
 

diff --git a/...functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt b/...functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt
@@ -31,7 +31,7 @@ class ApplicationPluginTest : BasePluginTest() {
       """.trimIndent(),
       settingsBlock = """
         plugins {
-          id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+          id 'org.gradle.toolchains.foojay-resolver-convention'
         }
       """.trimIndent(),
       runShadowBlock = """
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ dependencyResolutionManagement { @@
             includeGroupAndSubgroups("com.google")
           }
         }
+        gradlePluginPortal()
       }
     }
@@ Expand Down @@