Skip to content

Migrate AbstractCompileTask.getClasspath() to ConfigurableFileCollection #20137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 17 commits into from
Closed

Migrate AbstractCompileTask.getClasspath() to ConfigurableFileCollection #20137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3bdbbf1
Move AbstractCompile.classpath to ConfigurableFileCollection
asodja Mar 7, 2022
842a4bd
Revert "Move AbstractCompile.classpath to ConfigurableFileCollection"
asodja Mar 7, 2022
666fa67
Change classpath to ConfigurableFileCollection
asodja Mar 7, 2022
e04a028
Fix classpath conventions
asodja Mar 9, 2022
cb9ebf3
Fix code quality checks
asodja Mar 9, 2022
d1435cd
Try to bridge old method
asodja Mar 9, 2022
39ead26
Fix binary compatibility and other code quality reports
asodja Mar 9, 2022
ba3bdae
Add a workaround for tests
asodja Mar 9, 2022
12dd459
Fix samples
asodja Mar 14, 2022
dd5aecb
Fix Dependnecy verification test
asodja Mar 14, 2022
48794b4
Fix checkstyle
asodja Mar 14, 2022
21e7230
Additional fixes for tests
asodja Mar 14, 2022
b94ba44
Fix samples
asodja Mar 14, 2022
694e9e8
Try to remove convention mapping for AbstractCompile.classpath
asodja Mar 14, 2022
6b1d8ed
Lazily evaluate sourceSet.getCOmpileClasspath in JavaBasePlugin
asodja Mar 15, 2022
985a8c0
Remove broken old test in CrossTaskIncrementalJavaCompilationIntegrat…
asodja Mar 15, 2022
2c3b557
Revert changes in JvmTestSuitePlugin
asodja Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions subprojects/architecture-test/src/changes/accepted-public-api-changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
"changes": [
"Method is now abstract"
]
}, {
"type": "org.gradle.api.tasks.compile.AbstractCompile",
"member": "Class org.gradle.api.tasks.compile.AbstractCompile",
"acceptation": "Needed to bridge old methods",
"changes": [
"org.gradle.api.tasks.compile.BridgeAbstractCompile"
]
}
]
}
8 changes: 4 additions & 4 deletions subprojects/architecture-test/src/changes/archunit_store/provider-task-file-collection.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Method <org.gradle.api.tasks.JavaExec.getClasspath()> does not have raw return t
Method <org.gradle.api.tasks.SourceTask.getSource()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (SourceTask.java:72)
Method <org.gradle.api.tasks.Upload.getConfiguration()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Upload.java:121)
Method <org.gradle.api.tasks.bundling.War.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (War.java:129)
Method <org.gradle.api.tasks.compile.AbstractCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AbstractCompile.java:57)
Method <org.gradle.api.tasks.compile.GroovyCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:113)
Method <org.gradle.api.tasks.compile.AbstractCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (AbstractCompile.java:40)
Method <org.gradle.api.tasks.compile.GroovyCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:84)
Method <org.gradle.api.tasks.compile.GroovyCompile.getGroovyClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:388)
Method <org.gradle.api.tasks.compile.GroovyCompile.getSource()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (GroovyCompile.java:357)
Method <org.gradle.api.tasks.compile.JavaCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:403)
Method <org.gradle.api.tasks.compile.JavaCompile.getSource()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:120)
Method <org.gradle.api.tasks.compile.JavaCompile.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:97)
Method <org.gradle.api.tasks.compile.JavaCompile.getSource()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (JavaCompile.java:121)
Method <org.gradle.api.tasks.diagnostics.DependencyInsightReportTask.getConfiguration()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (DependencyInsightReportTask.java:173)
Method <org.gradle.api.tasks.javadoc.Groovydoc.getClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:182)
Method <org.gradle.api.tasks.javadoc.Groovydoc.getGroovyClasspath()> does not have raw return type assignable to org.gradle.api.file.ConfigurableFileCollection in (Groovydoc.java:165)
Expand Down
10 changes: 5 additions & 5 deletions subprojects/architecture-test/src/changes/archunit_store/provider-task-properties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ Method <org.gradle.api.tasks.bundling.War.getWebXml()> does not have raw return
Method <org.gradle.api.tasks.bundling.Zip.getEntryCompression()> does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:76)
Method <org.gradle.api.tasks.bundling.Zip.getMetadataCharset()> does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:123)
Method <org.gradle.api.tasks.bundling.Zip.isZip64()> does not have raw return type assignable to org.gradle.api.provider.Property in (Zip.java:111)
Method <org.gradle.api.tasks.compile.AbstractCompile.getDestinationDir()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:97)
Method <org.gradle.api.tasks.compile.AbstractCompile.getSourceCompatibility()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:145)
Method <org.gradle.api.tasks.compile.AbstractCompile.getTargetCompatibility()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:164)
Method <org.gradle.api.tasks.compile.AbstractCompile.getDestinationDir()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:102)
Method <org.gradle.api.tasks.compile.AbstractCompile.getSourceCompatibility()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:150)
Method <org.gradle.api.tasks.compile.AbstractCompile.getTargetCompatibility()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractCompile.java:169)
Method <org.gradle.api.tasks.compile.GroovyCompile.getGroovyOptions()> does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:368)
Method <org.gradle.api.tasks.compile.GroovyCompile.getOptions()> does not have raw return type assignable to org.gradle.api.provider.Provider in (GroovyCompile.java:378)
Method <org.gradle.api.tasks.compile.JavaCompile.getModularity()> does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:386)
Method <org.gradle.api.tasks.compile.JavaCompile.getOptions()> does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:396)
Method <org.gradle.api.tasks.compile.JavaCompile.getModularity()> does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:387)
Method <org.gradle.api.tasks.compile.JavaCompile.getOptions()> does not have raw return type assignable to org.gradle.api.provider.Provider in (JavaCompile.java:397)
Method <org.gradle.api.tasks.diagnostics.AbstractConfigurationReportTask.getReports()> does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractConfigurationReportTask.java:56)
Method <org.gradle.api.tasks.diagnostics.AbstractConfigurationReportTask.getReports()> does not have raw return type assignable to org.gradle.api.provider.Provider in (AbstractConfigurationReportTask.java:78)
Method <org.gradle.api.tasks.diagnostics.AbstractDependencyReportTask.getConfigurations()> does not have raw return type assignable to org.gradle.api.provider.Property in (AbstractDependencyReportTask.java:83)
Expand Down
10 changes: 5 additions & 5 deletions subprojects/architecture-test/src/changes/archunit_store/public-api-mutable-properties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,11 +555,11 @@ Method <org.gradle.plugin.devel.GradlePluginDevelopmentExtension.getPluginSource
Method <org.gradle.plugin.devel.GradlePluginDevelopmentExtension.getPlugins()> does not have raw return type assignable to org.gradle.api.provider.Provider in (GradlePluginDevelopmentExtension.java:140)
Method <org.gradle.plugin.devel.GradlePluginDevelopmentExtension.getTestSourceSets()> does not have raw return type assignable to org.gradle.api.provider.Provider in (GradlePluginDevelopmentExtension.java:131)
Method <org.gradle.plugin.devel.GradlePluginDevelopmentExtension.isAutomatedPublishing()> does not have raw return type assignable to org.gradle.api.provider.Property in (GradlePluginDevelopmentExtension.java:157)
Method <org.gradle.plugin.devel.PluginDeclaration.getDescription()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:100)
Method <org.gradle.plugin.devel.PluginDeclaration.getDisplayName()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:75)
Method <org.gradle.plugin.devel.PluginDeclaration.getId()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:50)
Method <org.gradle.plugin.devel.PluginDeclaration.getImplementationClass()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:58)
Method <org.gradle.plugin.devel.PluginDeclaration.getName()> does not have raw return type assignable to org.gradle.api.provider.Provider in (PluginDeclaration.java:46)
Method <org.gradle.plugin.devel.PluginDeclaration.getDescription()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:102)
Method <org.gradle.plugin.devel.PluginDeclaration.getDisplayName()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:77)
Method <org.gradle.plugin.devel.PluginDeclaration.getId()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:52)
Method <org.gradle.plugin.devel.PluginDeclaration.getImplementationClass()> does not have raw return type assignable to org.gradle.api.provider.Property in (PluginDeclaration.java:60)
Method <org.gradle.plugin.devel.PluginDeclaration.getName()> does not have raw return type assignable to org.gradle.api.provider.Provider in (PluginDeclaration.java:48)
Method <org.gradle.plugins.ear.EarPluginConvention.getAppDirName()> does not have raw return type assignable to org.gradle.api.provider.Property in (EarPluginConvention.java:0)
Method <org.gradle.plugins.ear.EarPluginConvention.getDeploymentDescriptor()> does not have raw return type assignable to org.gradle.api.provider.Property in (EarPluginConvention.java:0)
Method <org.gradle.plugins.ear.EarPluginConvention.getLibDirName()> does not have raw return type assignable to org.gradle.api.provider.Property in (EarPluginConvention.java:0)
Expand Down
13 changes: 6 additions & 7 deletions ...adle/integtests/resolve/verification/DependencyVerificationIntegrityCheckIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ This can indicate that a dependency has been compromised. Please carefully verif
failure.assertThatDescription(containsText("""Configuration cache problems found in this build.

1 problem was found storing the configuration cache.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':compileClasspath'' failed to visit file collection"""))
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'file collection' failed to visit file collection"""))
}

where:
Expand Down Expand Up @@ -315,7 +315,7 @@ This can indicate that a dependency has been compromised. Please carefully verif
failure.assertThatDescription(containsText("""Configuration cache problems found in this build.

1 problem was found storing the configuration cache.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':compileClasspath'' failed to visit file collection"""))
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'file collection' failed to visit file collection"""))
}


Expand Down Expand Up @@ -436,7 +436,7 @@ This can indicate that a dependency has been compromised. Please carefully verif
failure.assertThatDescription(containsText("""Configuration cache problems found in this build.

1 problem was found storing the configuration cache.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':compileClasspath'' failed to visit file collection"""))
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'file collection' failed to visit file collection"""))
}


Expand Down Expand Up @@ -548,7 +548,7 @@ If the artifacts are trustworthy, you will need to update the gradle/verificatio
failure.assertThatDescription(containsText("""Configuration cache problems found in this build.

1 problem was found storing the configuration cache.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':compileClasspath'' failed to visit file collection"""))
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'file collection' failed to visit file collection"""))
}

where:
Expand Down Expand Up @@ -669,9 +669,8 @@ If the artifacts are trustworthy, you will need to update the gradle/verificatio
if (GradleContextualExecuter.isConfigCache()) {
failure.assertThatDescription(containsText("""Configuration cache problems found in this build.

2 problems were found storing the configuration cache.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':compileClasspath'' failed to visit file collection
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'configuration ':included:compileClasspath'' failed to visit file collection"""))
2 problems were found storing the configuration cache, 1 of which seems unique.
- Task `:compileJava` of type `org.gradle.api.tasks.compile.JavaCompile`: value 'file collection' failed to visit file collection"""))
}

where:
Expand Down
Loading