From ab9742faa116c5a2c8edfe4b02750c3b1a8d854f Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Tue, 12 Nov 2019 17:48:05 +0100 Subject: [PATCH] Revert "Allow publication artifacts to be defined as files through providers (#11329)" This reverts commit a4b79f33fee015bb5faded27426369ad54bae8dd. --- ...blishArtifactCustomizationIntegTest.groovy | 11 ++------ .../IvyArtifactNotationParserFactory.java | 11 +------- ...blishArtifactCustomizationIntegTest.groovy | 25 +------------------ .../MavenArtifactNotationParserFactory.java | 11 +------- 4 files changed, 5 insertions(+), 53 deletions(-) diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomizationIntegTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomizationIntegTest.groovy index 86c1df495fc2..bacc460ad72c 100644 --- a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomizationIntegTest.groovy +++ b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomizationIntegTest.groovy @@ -25,17 +25,12 @@ class IvyPublishArtifactCustomizationIntegTest extends AbstractIvyPublishIntegTe void "can publish custom artifacts"() { given: createBuildScripts(""" - file("customFile.foo") << 'some foo' - file("customFile.bar") << 'some bar' - publications { ivy(IvyPublication) { artifact "customFile.txt" artifact customDocsTask.outputFile artifact regularFileTask.outputFile artifact customJar - artifact provider { file("customFile.foo") } - artifact provider { "customFile.bar" } } } """, """ @@ -51,7 +46,7 @@ class IvyPublishArtifactCustomizationIntegTest extends AbstractIvyPublishIntegTe then: module.assertPublished() - module.assertArtifactsPublished("ivy-2.4.xml", "ivyPublish-2.4.txt", "ivyPublish-2.4.foo", "ivyPublish-2.4.bar", "ivyPublish-2.4.html", "ivyPublish-2.4.reg", "ivyPublish-2.4.jar") + module.assertArtifactsPublished("ivy-2.4.xml", "ivyPublish-2.4.txt", "ivyPublish-2.4.html", "ivyPublish-2.4.reg", "ivyPublish-2.4.jar") and: def ivy = module.parsedIvy @@ -59,13 +54,11 @@ class IvyPublishArtifactCustomizationIntegTest extends AbstractIvyPublishIntegTe ivy.expectArtifact('ivyPublish', 'html').hasType("html").hasConf(null) ivy.expectArtifact('ivyPublish', 'jar').hasType("jar").hasConf(null) ivy.expectArtifact('ivyPublish', 'reg').hasType("reg").hasConf(null) - ivy.expectArtifact('ivyPublish', 'foo').hasType("foo").hasConf(null) - ivy.expectArtifact('ivyPublish', 'bar').hasType("bar").hasConf(null) and: resolveArtifacts(module) { withoutModuleMetadata { - expectFiles "ivyPublish-2.4.html", "ivyPublish-2.4.jar", "ivyPublish-2.4.reg", "ivyPublish-2.4.txt", "ivyPublish-2.4.foo", "ivyPublish-2.4.bar" + expectFiles "ivyPublish-2.4.html", "ivyPublish-2.4.jar", "ivyPublish-2.4.reg", "ivyPublish-2.4.txt" } withModuleMetadata { noComponentPublished() diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java index 83817ee094ef..def421b47a64 100644 --- a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java +++ b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java @@ -18,7 +18,6 @@ import org.gradle.api.artifacts.PublishArtifact; import org.gradle.api.internal.file.FileResolver; -import org.gradle.api.internal.provider.ProviderInternal; import org.gradle.api.internal.tasks.TaskDependencyContainer; import org.gradle.api.publish.ivy.IvyArtifact; import org.gradle.api.publish.ivy.internal.publisher.IvyPublicationIdentity; @@ -105,7 +104,7 @@ private FileNotationConverter(FileResolver fileResolver) { public void convert(Object notation, NotationConvertResult result) throws TypeConversionException { File file = fileResolverNotationParser.parseNotation(notation); IvyArtifact ivyArtifact = instantiator.newInstance(FileBasedIvyArtifact.class, file, publicationIdentity); - if (dependsOnTask(notation)) { + if (notation instanceof TaskDependencyContainer) { ivyArtifact.builtBy(notation); } result.converted(ivyArtifact); @@ -117,14 +116,6 @@ public void describe(DiagnosticsVisitor visitor) { } } - private boolean dependsOnTask(Object notation) { - if (notation instanceof ProviderInternal) { - ProviderInternal provider = (ProviderInternal) notation; - return provider.isContentProducedByTask() || provider.isValueProducedByTask(); - } - return notation instanceof TaskDependencyContainer; - } - private class IvyArtifactMapNotationConverter extends MapNotationConverter { private final NotationParser sourceNotationParser; diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy index 883f8ad62e89..a116ca5a4761 100644 --- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy +++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy @@ -23,16 +23,11 @@ class MavenPublishArtifactCustomizationIntegTest extends AbstractMavenPublishInt def "can attach custom artifacts"() { given: createBuildScripts(""" - file("customFile.foo") << 'some foo' - file("customFile.bar") << 'some bar' - publications { mavenCustom(MavenPublication) { artifact "customFile.txt" artifact customJar artifact regularFileTask.outputFile - artifact provider { file("customFile.foo") } - artifact provider { "customFile.bar" } } } """) @@ -42,7 +37,7 @@ class MavenPublishArtifactCustomizationIntegTest extends AbstractMavenPublishInt then: def module = mavenRepo.module("group", "projectText", "1.0") module.assertPublished() - module.assertArtifactsPublished("projectText-1.0.pom", "projectText-1.0.txt", "projectText-1.0.foo", "projectText-1.0.bar", "projectText-1.0-customjar.jar", "projectText-1.0.reg") + module.assertArtifactsPublished("projectText-1.0.pom", "projectText-1.0.txt", "projectText-1.0-customjar.jar", "projectText-1.0.reg") and: resolveArtifacts(module) { @@ -54,24 +49,6 @@ class MavenPublishArtifactCustomizationIntegTest extends AbstractMavenPublishInt expectFiles "projectText-1.0.txt" } } - resolveArtifacts(module) { - ext = 'foo' - withModuleMetadata { - noComponentPublished() - } - withoutModuleMetadata { - expectFiles "projectText-1.0.foo" - } - } - resolveArtifacts(module) { - ext = 'bar' - withModuleMetadata { - noComponentPublished() - } - withoutModuleMetadata { - expectFiles "projectText-1.0.bar" - } - } resolveArtifacts(module) { ext = 'reg' withModuleMetadata { diff --git a/subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/MavenArtifactNotationParserFactory.java b/subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/MavenArtifactNotationParserFactory.java index 868f07df3108..1f50e87cba6e 100644 --- a/subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/MavenArtifactNotationParserFactory.java +++ b/subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/MavenArtifactNotationParserFactory.java @@ -18,7 +18,6 @@ import org.gradle.api.artifacts.PublishArtifact; import org.gradle.api.internal.file.FileResolver; -import org.gradle.api.internal.provider.ProviderInternal; import org.gradle.api.internal.tasks.TaskDependencyContainer; import org.gradle.api.publish.maven.MavenArtifact; import org.gradle.api.tasks.bundling.AbstractArchiveTask; @@ -105,7 +104,7 @@ private FileNotationConverter(FileResolver fileResolver) { public void convert(Object notation, NotationConvertResult result) throws TypeConversionException { File file = fileResolverNotationParser.parseNotation(notation); MavenArtifact mavenArtifact = instantiator.newInstance(FileBasedMavenArtifact.class, file); - if (dependsOnTask(notation)) { + if (notation instanceof TaskDependencyContainer) { mavenArtifact.builtBy(notation); } result.converted(mavenArtifact); @@ -117,14 +116,6 @@ public void describe(DiagnosticsVisitor visitor) { } } - private boolean dependsOnTask(Object notation) { - if (notation instanceof ProviderInternal) { - ProviderInternal provider = (ProviderInternal) notation; - return provider.isContentProducedByTask() || provider.isValueProducedByTask(); - } - return notation instanceof TaskDependencyContainer; - } - private class MavenArtifactMapNotationConverter extends MapNotationConverter { private final NotationParser sourceNotationParser;