From 97a75b9d684e18343a247f08b270da95246363a1 Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Tue, 20 Sep 2022 11:50:39 -0400 Subject: [PATCH 1/3] Remove deprecated appendix property from AbstractArchiveTask --- .../changes/accepted-public-api-changes.json | 16 +++ .../3c3e47be-b5ed-426a-8b9f-cfa00d3b09db | 20 +-- .../provider-task-file-collection.txt | 34 ++--- .../provider-task-properties.txt | 119 +++++++++--------- .../archunit_store/provider-text-resource.txt | 4 +- .../public-api-mutable-file-collection.txt | 8 +- .../public-api-mutable-properties.txt | 80 ++++++------ .../public-api-mutable-text-resource.txt | 2 +- .../tasks/bundling/AbstractArchiveTask.java | 34 ----- 9 files changed, 149 insertions(+), 168 deletions(-) diff --git a/subprojects/architecture-test/src/changes/accepted-public-api-changes.json b/subprojects/architecture-test/src/changes/accepted-public-api-changes.json index ddce367cfdb3..a445c43d4f71 100644 --- a/subprojects/architecture-test/src/changes/accepted-public-api-changes.json +++ b/subprojects/architecture-test/src/changes/accepted-public-api-changes.json @@ -408,6 +408,22 @@ "From non-null returning to null returning breaking change" ] }, + { + "type": "org.gradle.api.tasks.bundling.AbstractArchiveTask", + "member": "Method org.gradle.api.tasks.bundling.AbstractArchiveTask.getAppendix()", + "acceptation": "Deprecated method removed in Gradle 8.0", + "changes": [ + "Method has been removed" + ] + }, + { + "type": "org.gradle.api.tasks.bundling.AbstractArchiveTask", + "member": "Method org.gradle.api.tasks.bundling.AbstractArchiveTask.setAppendix(java.lang.String)", + "acceptation": "Deprecated method removed in Gradle 8.0", + "changes": [ + "Method has been removed" + ] + }, { "type": "org.gradle.api.tasks.compile.GroovyCompile", "member": "Method org.gradle.api.tasks.compile.GroovyCompile.getFeaturePreviews()", diff --git a/subprojects/architecture-test/src/changes/archunit_store/3c3e47be-b5ed-426a-8b9f-cfa00d3b09db b/subprojects/architecture-test/src/changes/archunit_store/3c3e47be-b5ed-426a-8b9f-cfa00d3b09db index a76925e4c6b1..f5ab0e6231e1 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/3c3e47be-b5ed-426a-8b9f-cfa00d3b09db +++ b/subprojects/architecture-test/src/changes/archunit_store/3c3e47be-b5ed-426a-8b9f-cfa00d3b09db @@ -5,7 +5,7 @@ Method has arguments/return t Method has arguments/return type org.gradle.internal.Factory that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (ExclusiveContentRepository.java:0) Method has arguments/return type org.gradle.internal.metaobject.DynamicObject that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Convention.java:0) Method has arguments/return type org.gradle.api.internal.project.ProjectInternal that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (JavaPluginConvention.java:0) -Method has arguments/return type org.gradle.api.internal.project.IsolatedAntBuilder that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Checkstyle.java:123) +Method has arguments/return type org.gradle.api.internal.project.IsolatedAntBuilder that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Checkstyle.java:122) Method has arguments/return type org.gradle.api.internal.project.IsolatedAntBuilder that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (CodeNarc.java:127) Method has arguments/return type org.gradle.api.internal.project.IsolatedAntBuilder that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Pmd.java:117) Method has arguments/return type org.gradle.api.internal.attributes.ImmutableAttributes that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (GenerateMavenPom.java:65) @@ -25,12 +25,12 @@ Method has a Method has arguments/return type org.gradle.api.tasks.diagnostics.internal.PropertyReportRenderer that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (PropertyReportTask.java:67) Method has arguments/return type org.gradle.api.tasks.diagnostics.internal.ReportRenderer that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (TaskReportTask.java:69) Method has arguments/return type org.gradle.api.tasks.diagnostics.internal.TaskReportRenderer that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (TaskReportTask.java:76) -Method has arguments/return type org.gradle.api.internal.tasks.AntGroovydoc that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Groovydoc.java:199) -Method has arguments/return type org.gradle.api.internal.tasks.AntGroovydoc that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Groovydoc.java:208) +Method has arguments/return type org.gradle.api.internal.tasks.AntGroovydoc that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Groovydoc.java:198) +Method has arguments/return type org.gradle.api.internal.tasks.AntGroovydoc that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Groovydoc.java:207) Method has arguments/return type org.gradle.language.base.internal.compile.Compiler that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (ScalaCompile.java:123) -Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:915) -Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:910) -Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:919) +Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:917) +Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:912) +Method has arguments/return type org.gradle.api.internal.tasks.testing.TestFramework that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Test.java:921) Method has arguments/return type org.gradle.buildinit.plugins.internal.ProjectLayoutSetupRegistry that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (InitBuild.java:177) Method has arguments/return type org.gradle.external.javadoc.internal.JavadocOptionFileWriterContext that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (OptionLessJavadocOptionFileOption.java:0) Method has arguments/return type org.gradle.internal.operations.logging.BuildOperationLoggerFactory that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (Assemble.java:85) @@ -67,7 +67,7 @@ Method h Method has arguments/return type org.bouncycastle.openpgp.PGPSignatureGenerator that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (PgpSignatory.java:106) Method has arguments/return type org.bouncycastle.openpgp.PGPSecretKey that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (PgpSignatoryFactory.java:73) Method has arguments/return type org.bouncycastle.openpgp.PGPSecretKey that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (PgpSignatoryFactory.java:121) -Method has arguments/return type org.gradle.internal.Pair that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (CollectionUtils.java:590) -Method has arguments/return type org.gradle.internal.metaobject.ConfigureDelegate that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (ConfigureUtil.java:179) -Method has arguments/return type java.util.zip.Checksum that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (GFileUtils.java:279) -Method has arguments/return type org.gradle.internal.Factory that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (GUtil.java:176) \ No newline at end of file +Method has arguments/return type org.gradle.internal.Pair that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (CollectionUtils.java:656) +Method has arguments/return type org.gradle.internal.metaobject.ConfigureDelegate that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (ConfigureUtil.java:192) +Method has arguments/return type java.util.zip.Checksum that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (GFileUtils.java:329) +Method has arguments/return type org.gradle.internal.Factory that is not Gradle public API or primitive or built-in JDK classes or Groovy classes in (GUtil.java:195) \ No newline at end of file diff --git a/subprojects/architecture-test/src/changes/archunit_store/provider-task-file-collection.txt b/subprojects/architecture-test/src/changes/archunit_store/provider-task-file-collection.txt index d2217938e9a6..42048e51da63 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/provider-task-file-collection.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/provider-task-file-collection.txt @@ -1,8 +1,8 @@ Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AntlrTask.java:181) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AntlrTask.java:298) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:246) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:261) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:238) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:244) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:259) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Checkstyle.java:236) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CodeNarc.java:192) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CodeNarc.java:209) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CodeNarc.java:104) @@ -14,17 +14,17 @@ Method does not have raw Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaExec.java:488) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SourceTask.java:72) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Upload.java:115) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (War.java:130) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (War.java:129) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AbstractCompile.java:57) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:114) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:389) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:358) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:403) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:120) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (DependencyInsightReportTask.java:201) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:187) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:170) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:143) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:115) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:390) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:359) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:412) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:122) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (DependencyInsightReportTask.java:200) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:186) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:169) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:142) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Javadoc.java:336) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Javadoc.java:229) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (ScalaCompile.java:70) @@ -33,11 +33,11 @@ Method does not hav Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (ScalaDoc.java:151) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (ScalaDoc.java:163) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (ScalaDoc.java:113) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:355) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:1124) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:823) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:357) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:1126) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Test.java:825) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GenerateXcodeWorkspaceFileTask.java:60) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CreateStartScripts.java:320) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AbstractScalaCompile.java:280) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AbstractScalaCompile.java:279) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (InstallExecutable.java:164) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JacocoBase.java:36) \ No newline at end of file diff --git a/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt b/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt index 114b7948e5ba..908cb7d559d4 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt @@ -5,15 +5,15 @@ Method does not have raw retu Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntlrTask.java:95) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntlrTask.java:107) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntlrTask.java:119) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:100) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:297) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:338) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:368) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:390) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Checkstyle.java:328) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Checkstyle.java:63) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:348) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:410) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:99) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:295) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:336) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:366) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:388) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Checkstyle.java:326) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Checkstyle.java:62) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:346) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Checkstyle.java:408) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeNarc.java:95) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeNarc.java:299) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeNarc.java:245) @@ -116,29 +116,28 @@ Method does not have raw Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntTarget.java:66) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntTarget.java:82) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AntTarget.java:51) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:286) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:112) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractArchiveTask.java:164) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:241) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:419) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:385) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:198) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:375) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:331) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:511) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:540) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:341) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:297) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:477) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:506) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Tar.java:59) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (War.java:90) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (War.java:172) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (War.java:89) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (War.java:171) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:76) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:123) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:111) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:97) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:145) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:164) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:369) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:379) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:386) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:396) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:370) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:380) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:395) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:405) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractConfigurationReportTask.java:51) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractConfigurationReportTask.java:73) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractDependencyReportTask.java:111) @@ -148,24 +147,24 @@ Method doe Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractReportTask.java:140) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ConventionReportTask.java:88) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ConventionReportTask.java:109) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (DependencyInsightReportTask.java:167) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (DependencyInsightReportTask.java:233) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (DependencyInsightReportTask.java:166) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (DependencyInsightReportTask.java:232) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (DependencyReportTask.java:30) Method does not have raw return type assignable to org.gradle.api.provider.Property in (PropertyReportTask.java:63) Method does not have raw return type assignable to org.gradle.api.provider.Property in (TaskReportTask.java:114) Method does not have raw return type assignable to org.gradle.api.provider.Property in (TaskReportTask.java:142) Method does not have raw return type assignable to org.gradle.api.provider.Property in (TaskReportTask.java:69) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (TaskReportTask.java:92) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:199) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:153) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:282) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:320) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:301) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:443) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:263) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:231) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:246) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:216) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:198) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:152) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:281) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:319) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:300) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:400) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:262) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:230) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:245) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Groovydoc.java:215) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Javadoc.java:251) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Javadoc.java:416) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Javadoc.java:276) @@ -185,29 +184,29 @@ Method does Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractTestTask.java:102) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractTestTask.java:571) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractTestTask.java:368) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:547) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:494) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:512) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:388) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:478) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:572) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:887) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:288) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:539) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1160) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:864) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:279) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:428) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:436) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:412) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1194) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:380) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:632) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:958) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:321) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:915) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:243) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1137) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:549) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:496) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:514) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:390) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:480) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:574) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:889) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:290) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:541) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1162) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:866) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:281) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:430) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:438) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:414) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1196) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:382) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:634) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:960) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:323) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Test.java:917) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:245) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Test.java:1139) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Wrapper.java:426) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Wrapper.java:409) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Wrapper.java:309) @@ -244,7 +243,7 @@ Method does not have raw return type assignable to org.gradle.api.provider.Provider in (GenerateSolutionFileTask.java:57) Method does not have raw return type assignable to org.gradle.api.provider.Property in (GenerateSchemeFileTask.java:128) Method does not have raw return type assignable to org.gradle.api.provider.Property in (GenerateSchemeFileTask.java:51) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GenerateXcodeProjectFileTask.java:317) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GenerateXcodeProjectFileTask.java:319) Method does not have raw return type assignable to org.gradle.api.provider.Property in (GenerateXcodeWorkspaceFileTask.java:69) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CreateStartScripts.java:298) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CreateStartScripts.java:285) @@ -283,9 +282,9 @@ Method does not have raw return type assignable to org.gradle.api.provider.Property in (RunTestExecutable.java:91) Method does not have raw return type assignable to org.gradle.api.provider.Property in (RunTestExecutable.java:78) Method does not have raw return type assignable to org.gradle.api.provider.Property in (RunTestExecutable.java:96) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Ear.java:274) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Ear.java:215) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (Ear.java:252) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Ear.java:273) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (Ear.java:214) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (Ear.java:251) Method does not have raw return type assignable to org.gradle.api.provider.Property in (GeneratorTask.java:117) Method does not have raw return type assignable to org.gradle.api.provider.Property in (GeneratorTask.java:149) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (PropertyListGeneratorTask.java:55) diff --git a/subprojects/architecture-test/src/changes/archunit_store/provider-text-resource.txt b/subprojects/architecture-test/src/changes/archunit_store/provider-text-resource.txt index 419a2a67dd16..821301e4b0f5 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/provider-text-resource.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/provider-text-resource.txt @@ -1,4 +1,4 @@ -Method has raw return type org.gradle.api.resources.TextResource in (Checkstyle.java:278) +Method has raw return type org.gradle.api.resources.TextResource in (Checkstyle.java:276) Method has raw return type org.gradle.api.resources.TextResource in (CodeNarc.java:228) Method has raw return type org.gradle.api.resources.TextResource in (Pmd.java:304) -Method has raw return type org.gradle.api.resources.TextResource in (Groovydoc.java:339) \ No newline at end of file +Method has raw return type org.gradle.api.resources.TextResource in (Groovydoc.java:338) \ No newline at end of file diff --git a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-file-collection.txt b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-file-collection.txt index 57c52d54020c..3164650bdcea 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-file-collection.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-file-collection.txt @@ -1,10 +1,10 @@ -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (PmdExtension.java:185) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (PmdExtension.java:184) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SourceSet.java:0) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SourceSet.java:0) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SourceSet.java:0) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:432) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:274) -Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:410) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:453) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:277) +Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (CompileOptions.java:431) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SigningExtension.java:278) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaExecSpec.java:0) Method does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaForkOptions.java:0) \ No newline at end of file diff --git a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-properties.txt b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-properties.txt index ab035b3b2072..7438b4918d5a 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-properties.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-properties.txt @@ -189,9 +189,9 @@ Method doe Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeQualityExtension.java:51) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeQualityExtension.java:37) Method does not have raw return type assignable to org.gradle.api.provider.Property in (CodeQualityExtension.java:67) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:64) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:95) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:217) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:63) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:94) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (PmdExtension.java:216) Method does not have raw return type assignable to org.gradle.api.provider.Property in (IvyArtifact.java:0) Method does not have raw return type assignable to org.gradle.api.provider.Property in (IvyArtifact.java:0) Method does not have raw return type assignable to org.gradle.api.provider.Property in (IvyArtifact.java:0) @@ -248,39 +248,39 @@ Method does not have Method does not have raw return type assignable to org.gradle.api.provider.Property in (BaseForkOptions.java:83) Method does not have raw return type assignable to org.gradle.api.provider.Property in (BaseForkOptions.java:47) Method does not have raw return type assignable to org.gradle.api.provider.Property in (BaseForkOptions.java:64) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (CompileOptions.java:326) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:505) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:316) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (CompileOptions.java:341) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:221) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:188) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:293) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:255) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:205) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:155) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:110) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:238) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:385) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:140) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:125) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:170) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (CompileOptions.java:329) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:526) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:319) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (CompileOptions.java:344) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:224) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:191) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:296) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:258) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:208) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:158) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:113) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:241) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:388) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:143) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:128) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (CompileOptions.java:173) Method does not have raw return type assignable to org.gradle.api.provider.Property in (DebugOptions.java:52) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ForkOptions.java:49) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ForkOptions.java:73) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ForkOptions.java:95) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:194) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:127) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:333) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:258) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:286) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:316) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:82) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:142) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:220) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:351) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:112) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:239) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:97) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:193) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:126) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:331) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:257) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:285) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:314) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:81) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:141) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:219) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:349) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:111) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:238) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (GroovyCompileOptions.java:96) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (ProviderAwareCompilerDaemonForkOptions.java:60) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (ProviderAwareCompilerDaemonForkOptions.java:49) Method does not have raw return type assignable to org.gradle.api.provider.Property in (ScalaDocOptions.java:165) @@ -352,11 +352,11 @@ Method does no Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractBuildCache.java:49) Method does not have raw return type assignable to org.gradle.api.provider.Property in (BuildCache.java:0) Method does not have raw return type assignable to org.gradle.api.provider.Property in (BuildCache.java:0) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (HttpBuildCache.java:98) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:70) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:155) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:124) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:196) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (HttpBuildCache.java:97) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:69) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:154) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:123) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCache.java:193) Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCacheCredentials.java:61) Method does not have raw return type assignable to org.gradle.api.provider.Property in (HttpBuildCacheCredentials.java:40) Method does not have raw return type assignable to org.gradle.api.provider.Property in (DirectoryBuildCache.java:38) @@ -636,8 +636,8 @@ Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseWtpComponent.java:290) Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseWtpComponent.java:219) Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseWtpComponent.java:206) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseWtpFacet.java:129) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (EclipseWtpFacet.java:94) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseWtpFacet.java:131) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (EclipseWtpFacet.java:96) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Facet.java:77) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Facet.java:69) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Facet.java:85) @@ -858,7 +858,7 @@ Method does not have raw return type assignable to org.gradle.api.provider.Provider in (UnexpectedBuildResultException.java:40) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (ListenerFailedException.java:39) Method does not have raw return type assignable to org.gradle.api.provider.Property in (EclipseRuntime.java:0) -Method does not have raw return type assignable to org.gradle.api.provider.Provider in (ConfigureUtil.java:121) +Method does not have raw return type assignable to org.gradle.api.provider.Provider in (ConfigureUtil.java:130) Method does not have raw return type assignable to org.gradle.api.provider.Property in (VersionControlRepository.java:0) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (VersionControlSpec.java:0) Method does not have raw return type assignable to org.gradle.api.provider.Property in (VersionControlSpec.java:0) diff --git a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-text-resource.txt b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-text-resource.txt index 0eec6a286d0d..6a9edcc0e25e 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-text-resource.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-text-resource.txt @@ -1,5 +1,5 @@ Method has raw return type org.gradle.api.resources.TextResource in (CheckstyleExtension.java:67) Method has raw return type org.gradle.api.resources.TextResource in (CodeNarcExtension.java:53) -Method has raw return type org.gradle.api.resources.TextResource in (PmdExtension.java:158) +Method has raw return type org.gradle.api.resources.TextResource in (PmdExtension.java:157) Method has raw return type org.gradle.api.resources.TextResource in (CustomizableHtmlReport.java:0) Method has raw return type org.gradle.api.resources.TextResource in (TemplateBasedScriptGenerator.java:0) \ No newline at end of file diff --git a/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java b/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java index b8a9d57bf580..a8d10464f1f8 100644 --- a/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java +++ b/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java @@ -273,40 +273,6 @@ public Property getArchiveBaseName() { return archiveBaseName; } - /** - * Returns the appendix part of the archive name, if any. - * - * @return the appendix. May be null - * @deprecated Use {@link #getArchiveAppendix()} - */ - @Nullable - @Deprecated - @ReplacedBy("archiveAppendix") - public String getAppendix() { - DeprecationLogger.deprecateProperty(AbstractArchiveTask.class, "appendix").replaceWith("archiveAppendix") - .willBeRemovedInGradle8() - .withDslReference() - .nagUser(); - - return archiveAppendix.getOrNull(); - } - - /** - * Sets the appendix. - * - * @deprecated Use {@link #getArchiveAppendix()} - */ - @Deprecated - public void setAppendix(@Nullable String appendix) { - DeprecationLogger.deprecateProperty(AbstractArchiveTask.class, "appendix").replaceWith("archiveAppendix") - .willBeRemovedInGradle8() - .withDslReference() - .nagUser(); - - archiveAppendix.convention(appendix); - archiveAppendix.set(appendix); - } - /** * Returns the appendix part of the archive name, if any. * From 86a08daaf3d71667750701e753e9a9d368de0e30 Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Tue, 20 Sep 2022 14:19:25 -0400 Subject: [PATCH 2/3] Remove deprecated classifier property from AbstractArchiveTask - Also adjust DSL documentation to remove classifier and appendix. --- .../changes/accepted-public-api-changes.json | 16 +++++++++ .../provider-task-properties.txt | 5 ++- .../tasks/bundling/AbstractArchiveTask.java | 35 ------------------- ...api.tasks.bundling.AbstractArchiveTask.xml | 8 ----- 4 files changed, 18 insertions(+), 46 deletions(-) diff --git a/subprojects/architecture-test/src/changes/accepted-public-api-changes.json b/subprojects/architecture-test/src/changes/accepted-public-api-changes.json index a445c43d4f71..2266af7d8275 100644 --- a/subprojects/architecture-test/src/changes/accepted-public-api-changes.json +++ b/subprojects/architecture-test/src/changes/accepted-public-api-changes.json @@ -416,6 +416,14 @@ "Method has been removed" ] }, + { + "type": "org.gradle.api.tasks.bundling.AbstractArchiveTask", + "member": "Method org.gradle.api.tasks.bundling.AbstractArchiveTask.getClassifier()", + "acceptation": "Deprecated method removed in Gradle 8.0", + "changes": [ + "Method has been removed" + ] + }, { "type": "org.gradle.api.tasks.bundling.AbstractArchiveTask", "member": "Method org.gradle.api.tasks.bundling.AbstractArchiveTask.setAppendix(java.lang.String)", @@ -424,6 +432,14 @@ "Method has been removed" ] }, + { + "type": "org.gradle.api.tasks.bundling.AbstractArchiveTask", + "member": "Method org.gradle.api.tasks.bundling.AbstractArchiveTask.setClassifier(java.lang.String)", + "acceptation": "Deprecated method removed in Gradle 8.0", + "changes": [ + "Method has been removed" + ] + }, { "type": "org.gradle.api.tasks.compile.GroovyCompile", "member": "Method org.gradle.api.tasks.compile.GroovyCompile.getFeaturePreviews()", diff --git a/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt b/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt index 908cb7d559d4..41f27ef1489f 100644 --- a/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt +++ b/subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt @@ -119,12 +119,11 @@ Method does not have raw return Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:112) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractArchiveTask.java:164) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:241) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:385) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:198) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:341) Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:297) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:477) -Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:506) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:442) +Method does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractArchiveTask.java:471) Method does not have raw return type assignable to org.gradle.api.provider.Property in (Tar.java:59) Method does not have raw return type assignable to org.gradle.api.provider.Provider in (War.java:89) Method does not have raw return type assignable to org.gradle.api.provider.Property in (War.java:171) diff --git a/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java b/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java index a8d10464f1f8..385ab23687aa 100644 --- a/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java +++ b/subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java @@ -372,41 +372,6 @@ public Property getArchiveExtension() { return archiveExtension; } - /** - * Returns the classifier part of the archive name, if any. - * - * @return The classifier. May be null. - * @deprecated Use {@link #getArchiveClassifier()} - */ - @Nullable - @Deprecated - @ReplacedBy("archiveClassifier") - public String getClassifier() { - DeprecationLogger.deprecateProperty(AbstractArchiveTask.class, "classifier").replaceWith("archiveClassifier") - .willBeRemovedInGradle8() - .withDslReference() - .nagUser(); - - return archiveClassifier.getOrNull(); - } - - /** - * Sets the classifier. - * - * @deprecated Use {@link #getArchiveClassifier()} - */ - @Deprecated - public void setClassifier(@Nullable String classifier) { - // This is used by the Kotlin plugin, we should upstream a fix to avoid this API first. https://github.com/gradle/gradle/issues/16783 - /*DeprecationLogger.deprecateProperty(AbstractArchiveTask.class, "classifier").replaceWith("archiveClassifier") - .willBeRemovedInGradle8() - .withDslReference() - .nagUser();*/ - - archiveClassifier.convention(classifier); - archiveClassifier.set(classifier); - } - /** * Returns the classifier part of the archive name, if any. * diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.bundling.AbstractArchiveTask.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.bundling.AbstractArchiveTask.xml index 8d854c17bcaa..781dd78193d1 100644 --- a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.bundling.AbstractArchiveTask.xml +++ b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.bundling.AbstractArchiveTask.xml @@ -28,10 +28,6 @@ archiveAppendix "" - - appendix - "" - baseName project.archivesBaseName @@ -60,10 +56,6 @@ archiveClassifier "" - - classifier - "" - destinationDir project.distsDir From 0e8c6582cbb2818e1551f336ba2c6a7f7419ae6f Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Wed, 21 Sep 2022 07:57:29 -0400 Subject: [PATCH 3/3] Upgrade tested version of shadow plugin --- .../kotlinDsl/multiProjectBuild/kotlin/build.gradle.kts | 2 +- .../groovy/org/gradle/smoketests/AbstractSmokeTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/docs/src/snippets/kotlinDsl/multiProjectBuild/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/kotlinDsl/multiProjectBuild/kotlin/build.gradle.kts index 53a4c2e4c89a..4004b2bf8afc 100644 --- a/subprojects/docs/src/snippets/kotlinDsl/multiProjectBuild/kotlin/build.gradle.kts +++ b/subprojects/docs/src/snippets/kotlinDsl/multiProjectBuild/kotlin/build.gradle.kts @@ -5,7 +5,7 @@ import ratpack.gradle.RatpackExtension // tag::root[] plugins { - id("com.github.johnrengelman.shadow") version "4.0.1" apply false + id("com.github.johnrengelman.shadow") version "6.0.0" apply false id("io.ratpack.ratpack-java") version "1.8.2" apply false } // end::root[] diff --git a/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy b/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy index d49c05d45b4d..9d9dfaefc8cf 100644 --- a/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy +++ b/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy @@ -78,7 +78,7 @@ abstract class AbstractSmokeTest extends Specification { static nebulaResolutionRules = "9.0.0" // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow - static shadow = Versions.of("4.0.4", "6.0.0", "6.1.0", "7.0.0", "7.1.2") + static shadow = Versions.of("6.0.0", "6.1.0", "7.0.0", "7.1.2") // https://github.com/asciidoctor/asciidoctor-gradle-plugin/releases static asciidoctor = Versions.of("3.3.2")