ConventionMapping doesn't work correctly for DirectoryProperty and RegularFileProperty after upgrade

[asodja]

If we upgrade a property from a File to DirectoryProperty or RegularFileProperty, and there are some convention mapping defined in plugins, we incorrectly handle them. The logic that modifies that code is here:

gradle/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/extensibility/ConventionAwareHelper.java

Lines 101 to 119 in 063b470

	private boolean mapConventionOn(SupportsConvention target, MappedPropertyImpl mapping) {
	if (target instanceof Property) {
	Property<Object> asProperty = Cast.uncheckedNonnullCast(target);
	asProperty.convention(new DefaultProvider<>(() -> mapping.getValue(_convention, _source)));
	} else if (target instanceof MapProperty) {
	MapProperty<Object, Object> asMapProperty = Cast.uncheckedNonnullCast(target);
	DefaultProvider<Map<Object, Object>> convention = new DefaultProvider<>(() -> Cast.uncheckedNonnullCast(mapping.getValue(_convention, _source)));
	asMapProperty.convention(convention);
	} else if (target instanceof HasMultipleValues) {
	HasMultipleValues<Object> asCollectionProperty = Cast.uncheckedNonnullCast(target);
	asCollectionProperty.convention(new DefaultProvider<>(() -> Cast.uncheckedNonnullCast(mapping.getValue(_convention, _source))));
	} else if (target instanceof ConfigurableFileCollection) {
	ConfigurableFileCollection asFileCollection = Cast.uncheckedNonnullCast(target);
	asFileCollection.convention((Callable) () -> mapping.getValue(_convention, _source));
	} else {
	return false;
	}
	return true;
	}

For example user can have code like:

createStartScripts.getConventionMapping()
	.map("outputDir", () -> project.getLayout().getBuildDirectory().dir("bootScripts").get().getAsFile());

(see spring-boot plugin).

Failure looks like:

FAILURE: Build failed with an exception.
  
  * What went wrong:
  Execution failed for task ':bootStartScripts'.
  > Failed to calculate the value of task ':bootStartScripts' property 'outputDir'.
     > Cannot get the value of task ':bootStartScripts' property 'outputDir' of type org.gradle.api.file.Directory as the provider associated with this property returned a value of type java.io.File.

The problem is, that convention mapping returns a File, while DirectoryProperty.convention() expects a Directory and RegularFileProperty.convention() expects a RegularFile.