more formatting

cdsap · Aug 7, 2024 · 3cf616f · 3cf616f
1 parent 3933850
commit 3cf616f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 21 deletions.
diff --git a/...le-application-plugin/src/main/java/io/quarkus/gradle/tasks/AbstractQuarkusExtension.java b/...le-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<String> 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<String, String> forcedPropertiesProperty() {
+    protected MapProperty<String, String> forcedPropertiesProperty() {
         return forcedPropertiesProperty;
     }
 
@@ -249,14 +249,14 @@ private void exportCustomManifestProperties(Map<String, Object> 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/...lugin/src/main/java/io/quarkus/gradle/workspace/descriptors/ProjectDescriptorBuilder.java b/...lugin/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<File> srcDir = new AtomicReference<>();

diff --git a/...lugin/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/build.gradle.kts b/...lugin/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/...in/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/settings.gradle.kts b/...in/src/test/resources/io/quarkus/gradle/tasks/configurationcache/main/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "configuration-cache"