diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/AbstractQuarkusExtension.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/AbstractQuarkusExtension.java index b8550f1f73a0a..58976d97f65a9 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/AbstractQuarkusExtension.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/AbstractQuarkusExtension.java @@ -39,7 +39,7 @@ public abstract class AbstractQuarkusExtension { private static final String MANIFEST_SECTIONS_PROPERTY_PREFIX = "quarkus.package.jar.manifest.sections"; private static final String MANIFEST_ATTRIBUTES_PROPERTY_PREFIX = "quarkus.package.jar.manifest.attributes"; - public static final String QUARKUS_PROFILE = "quarkus.profile"; + protected static final String QUARKUS_PROFILE = "quarkus.profile"; protected final Project project; protected final File projectDir; protected final Property finalName; @@ -96,12 +96,12 @@ private BaseConfig buildBaseConfig() { return new BaseConfig(effectiveConfig); } - public BaseConfig baseConfig() { + protected BaseConfig baseConfig() { this.baseConfig.finalizeValue(); return this.baseConfig.get(); } - public MapProperty forcedPropertiesProperty() { + protected MapProperty forcedPropertiesProperty() { return forcedPropertiesProperty; } @@ -249,14 +249,14 @@ private void exportCustomManifestProperties(Map properties) { } } - public static String toManifestAttributeKey(String key) { + protected static String toManifestAttributeKey(String key) { if (key.contains("\"")) { throw new GradleException("Manifest entry name " + key + " is invalid. \" characters are not allowed."); } return String.format("%s.\"%s\"", MANIFEST_ATTRIBUTES_PROPERTY_PREFIX, key); } - public static String toManifestSectionAttributeKey(String section, String key) { + protected static String toManifestSectionAttributeKey(String section, String key) { if (section.contains("\"")) { throw new GradleException("Manifest section name " + section + " is invalid. \" characters are not allowed."); } diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/workspace/descriptors/ProjectDescriptorBuilder.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/workspace/descriptors/ProjectDescriptorBuilder.java index 10eb6c0e82bb9..3a7fed5c25e69 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/workspace/descriptors/ProjectDescriptorBuilder.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/workspace/descriptors/ProjectDescriptorBuilder.java @@ -94,21 +94,6 @@ private void readConfigurationFor(AbstractCompile task) { } private void readConfigurationFor(Test task) { - // if (task.getEnabled() && !task.getSource().isEmpty()) { - // File destDir = task.getDestinationDirectory().getAsFile().get(); - // task.getSource().visit(fileVisitDetails -> { - // if (fileVisitDetails.getRelativePath().getParent().toString().isEmpty()) { - // File srcDir = fileVisitDetails.getFile().getParentFile(); - // builder.tasks.put(task.getName(), new QuarkusTaskDescriptor(task.getName(), COMPILE, srcDir, destDir)); - // SourceSetContainer sourceSets = task.getProject().getExtensions().getByType(SourceSetContainer.class); - // sourceSets.stream().filter(sourceSet -> sourceSet.getOutput().getClassesDirs().contains(destDir)) - // .forEach(sourceSet -> builder.sourceSetTasks - // .computeIfAbsent(sourceSet.getName(), s -> ConcurrentHashMap.newKeySet()) - // .add(task.getName())); - // fileVisitDetails.stopVisiting(); - // } - // }); - // } } private void readConfigurationFor(ProcessResources task) { @@ -139,7 +124,6 @@ private void withKotlinJvmCompileType(Project project) { } private void readConfigurationFor(KotlinJvmCompile task) { - // TODO add task to sourceSetTasks if (task.getEnabled() && !task.getSources().isEmpty()) { File destDir = task.getDestinationDirectory().getAsFile().get(); AtomicReference srcDir = new AtomicReference<>(); diff --git a/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/build.gradle.kts b/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/build.gradle.kts new file mode 100644 index 0000000000000..8fb484c22a651 --- /dev/null +++ b/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + java + id("io.quarkus") +} + +buildscript { + repositories { + mavenLocal() + mavenCentral() + } +} + +repositories { + mavenLocal() + mavenCentral() +} + +dependencies { + implementation(enforcedPlatform("io.quarkus:quarkus-bom:${project.property("version")}")) + implementation("jakarta.inject:jakarta.inject-api:2.0.1") +} + +quarkus { + quarkusBuildProperties.put("quarkus.foo", "bar") + manifest { + attributes(mapOf("Manifest-Attribute" to "some-value")) + } + + // The following line is replaced by the tests in `CachingTest` + // ADDITIONAL_CONFIG +} diff --git a/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/settings.gradle.kts b/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/settings.gradle.kts new file mode 100644 index 0000000000000..c35dae34f86ef --- /dev/null +++ b/devtools/gradle/gradle-application-plugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "configuration-cache"