gradle · abstratt · Nov 14, 2024 · Oct 11, 2024 · Oct 11, 2024 · Oct 11, 2024
@@ -66,7 +66,7 @@ class DeprecatedFeaturesListener(
     }
 
     override fun onProjectAccess(invocationDescription: String, task: TaskInternal, runningTask: TaskInternal?) {
-        if (shouldNagFor(task, runningTask)) {
+        if (shouldNagFor(task, runningTask, ignoreStable = true)) {
             nagUserAbout("Invocation of $invocationDescription at execution time", 7, "task_project")
         }
     }
@@ -98,13 +98,13 @@ class DeprecatedFeaturesListener(
     }
 
     private
-    fun shouldNagFor(task: TaskInternal, runningTask: TaskInternal?) =
-        shouldNag() && shouldReportInContext(task, runningTask)
+    fun shouldNagFor(task: TaskInternal, runningTask: TaskInternal?, ignoreStable: Boolean = false) =
+        shouldNag(ignoreStable) && shouldReportInContext(task, runningTask)
 
     private
-    fun shouldNag(): Boolean =
+    fun shouldNag(ignoreStable: Boolean = false): Boolean =
         // TODO:configuration-cache - this listener shouldn't be registered when cc is enabled
-        !buildModelParameters.isConfigurationCache && featureFlags.isEnabled(STABLE_CONFIGURATION_CACHE)
+        !buildModelParameters.isConfigurationCache && (ignoreStable || featureFlags.isEnabled(STABLE_CONFIGURATION_CACHE))
 
     private
     fun shouldNagAbout(listener: Any): Boolean = shouldNag() && !isSupportedListener(listener)

@@ -18,13 +18,14 @@ package org.gradle.model
 
 import org.gradle.api.reporting.model.ModelReportOutput
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 import org.gradle.language.base.FunctionalSourceSet
 import org.gradle.platform.base.ComponentSpec
 import spock.lang.Issue
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class ModelMapIntegrationTest extends AbstractIntegrationSpec {
+class ModelMapIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
     def "provides basic meta-data for map"() {
         when:
         buildFile '''
@@ -117,6 +118,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "components"
         failure.assertHasCause("Cannot create an instance of type 'NonRegisteredComponent' as this type is not known. Known types: ${ComponentSpec.name}, SampleComponent.")
     }
@@ -142,6 +144,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "model"
         failure.assertHasCause("Cannot create an instance of type 'NonRegisteredComponent' as this type is not known. Known types: ${ComponentSpec.name}, SampleComponent.")
     }
@@ -170,6 +173,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "model"
         failure.assertHasCause("Cannot create an instance of type 'NonRegisteredComponent' as this type is not known. Known types: SampleComponent.")
     }
@@ -196,6 +200,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "components"
         failure.assertHasCause("Cannot create an instance of type 'NonRegisteredComponent' as this type is not known. Known types: SampleComponent.")
     }
@@ -221,6 +226,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "components"
         failure.assertHasCause("Cannot create 'components.other' with type 'SampleComponent' as this is not a subtype of 'Sample2Component'.")
     }
@@ -247,6 +253,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         succeeds "components"
     }
 
@@ -267,6 +274,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "model"
         failureHasCause "Cannot create 'things.bad' with type '$FunctionalSourceSet.name' as this is not a subtype of 'Thing'."
     }
@@ -322,6 +330,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         succeeds "model"
         ModelReportOutput.from(output).hasNodeStructure {
             things {
@@ -350,6 +359,7 @@ class ModelMapIntegrationTest extends AbstractIntegrationSpec {
         """
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "model"
         failureHasCause "Exception thrown while executing model rule: things { ... } @ build.gradle line 12, column 17"
         failureHasCause "Cannot create 'things.thing' with type 'UnknownThing' as this is not a subtype of 'Thing'."

@@ -17,11 +17,12 @@
 package org.gradle.model
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 import org.gradle.language.base.LanguageSourceSet
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSpec {
+class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
     def "@Rule method can apply rules to a particular target"() {
         buildFile << '''
             @Managed
@@ -422,6 +423,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
         '''
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails("model")
         failure.assertHasCause("Exception thrown while executing model rule: MyPlugin#rules")
         failure.assertHasCause("broken")
@@ -456,6 +458,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
         '''
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails 'model'
         failure.assertHasCause("Exception thrown while executing model rule: CalculateName#defaultName")
         failure.assertHasCause("broken")
@@ -489,6 +492,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
         '''
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails 'model'
         failure.assertHasCause("Exception thrown while executing model rule: MyPlugin#rules")
         failure.assertHasCause("broken")
@@ -511,6 +515,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
 
         expect:
         succeeds("tasks")
+        expectTaskGetProjectDeprecations()
         fails("model")
     }
 
@@ -550,6 +555,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
         '''
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails("model")
         failure.assertHasCause("Exception thrown while executing model rule: MyPlugin#rules")
         failure.assertHasCause('''Type BrokenRuleSource is not a valid rule source:
@@ -578,6 +584,7 @@ class RuleSourceAppliedByRuleMethodIntegrationTest extends AbstractIntegrationSp
         '''
 
         expect:
+        expectTaskGetProjectDeprecations()
         fails "model"
         failure.assertHasCause('''The following model rules could not be applied due to unbound inputs and/or subjects:
 

@@ -17,10 +17,11 @@
 package org.gradle.model.managed
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class InvalidManagedModelRuleIntegrationTest extends AbstractIntegrationSpec {
+class InvalidManagedModelRuleIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
 
     def "provides a useful error message when setting an incompatible type on a managed instance in Groovy"() {
         when:
@@ -194,6 +195,7 @@ class InvalidManagedModelRuleIntegrationTest extends AbstractIntegrationSpec {
         '''
 
         then:
+        expectTaskGetProjectDeprecations()
         fails "model"
 
         and:

@@ -17,12 +17,13 @@
 package org.gradle.model.managed
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 
 import static org.hamcrest.CoreMatchers.containsString
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class ManagedModelGroovyScalarConfigurationIntegrationTest extends AbstractIntegrationSpec {
+class ManagedModelGroovyScalarConfigurationIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
 
     private static final String CLASSES = '''
         enum Thing {
@@ -495,6 +496,7 @@ The following types/formats are supported:
         '''
 
         then:
+        expectTaskGetProjectDeprecations(5)
         succeeds 'printResolvedValues'
 
         and:
@@ -531,6 +533,7 @@ The following types/formats are supported:
         '''
 
         then:
+        expectTaskGetProjectDeprecations()
         fails 'model'
 
         and:
@@ -546,6 +549,7 @@ The following types/formats are supported:
         '''
 
         then:
+        expectTaskGetProjectDeprecations()
         fails 'model'
 
         and:
@@ -605,6 +609,7 @@ The following types/formats are supported:
         file('p2/build.gradle') << model
 
         then:
+        expectTaskGetProjectDeprecations(3)
         succeeds ':p1:printResolvedValues', ':p2:printResolvedValues'
 
         and:

@@ -17,10 +17,11 @@
 package org.gradle.model.managed
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class ManagedScalarCollectionsIntegrationTest extends AbstractIntegrationSpec {
+class ManagedScalarCollectionsIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
 
     private final static List<String> MANAGED_SCALAR_COLLECTION_TYPES = ['List', 'Set']
 
@@ -358,6 +359,7 @@ class ManagedScalarCollectionsIntegrationTest extends AbstractIntegrationSpec {
         """
 
         then:
+        expectTaskGetProjectDeprecations()
         fails 'model'
 
         and:
@@ -389,6 +391,7 @@ A valid scalar collection takes the form of List<T> or Set<T> where 'T' is one o
         """
 
         then:
+        expectTaskGetProjectDeprecations()
         fails 'model'
 
         and:

@@ -18,10 +18,11 @@ package org.gradle.model.managed
 
 import org.gradle.api.artifacts.Configuration
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class ScalarTypesInManagedModelIntegrationTest extends AbstractIntegrationSpec {
+class ScalarTypesInManagedModelIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
 
     def "values of primitive types and boxed primitive types are widened as usual when using groovy"() {
         when:
@@ -390,6 +391,7 @@ class ScalarTypesInManagedModelIntegrationTest extends AbstractIntegrationSpec {
         '''
 
         then:
+        expectTaskGetProjectDeprecations()
         succeeds "model"
     }
 

@@ -17,10 +17,11 @@
 package org.gradle.model.dsl
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.StableConfigurationCacheDeprecations
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 
 @UnsupportedWithConfigurationCache(because = "software model")
-class ManagedTypeDslIntegrationTest extends AbstractIntegrationSpec {
+class ManagedTypeDslIntegrationTest extends AbstractIntegrationSpec implements StableConfigurationCacheDeprecations {
 
     def "can configure a child of a managed type using a nested closure syntax"() {
         buildFile << '''
@@ -118,6 +119,7 @@ model {
 '''
 
         when:
+        expectTaskGetProjectDeprecations()
         fails "model"
 
         then:
@@ -144,6 +146,7 @@ model {
 '''
 
         when:
+        expectTaskGetProjectDeprecations()
         fails "model"
 
         then:
@@ -171,6 +174,7 @@ model {
 '''
 
         when:
+        expectTaskGetProjectDeprecations()
         fails "model"
 
         then:
@@ -197,6 +201,7 @@ model {
 '''
 
         when:
+        expectTaskGetProjectDeprecations()
         fails "model"
 
         then:

@@ -247,8 +247,9 @@ class ModelDslIntegrationTest extends AbstractIntegrationSpec {
             model {
               tasks {
                 create("printStrings") {
+                  def projectName = it.project.name
                   doLast {
-                    println it.project.name + ": " + $.strings
+                    println projectName + ": " + $.strings
                   }
                 }
               }