Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions src/main/java/org/sonarqube/gradle/SonarQubePlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -137,7 +138,6 @@ private static List<File> registerAndConfigureResolverTasks(Project topLevelProj
}
DirectoryProperty buildDirectory = target.getLayout().getBuildDirectory();
File localSonarResolver = new File(buildDirectory.getAsFile().get(), "sonar-resolver");
localSonarResolver.mkdirs();
task.setOutputDirectory(localSonarResolver);
resolverFiles.add(task.getOutputFile());
// Android uses JetifyTransform to translate and ensure compatibility for specific deprecated libraries.
Expand Down Expand Up @@ -187,7 +187,22 @@ private static void configureTask(SonarTask sonarTask, Project project, Map<Stri
sonarTask.mustRunAfter(getAndroidTasks(project));
sonarTask.mustRunAfter(getJavaTestTasks(project));
sonarTask.mustRunAfter(getJacocoTasks(project));
sonarTask.dependsOn(getClassPathResolverTask(project));
if (isSkipCompile(project)) {
LOGGER.info("sonar.gradle.skipCompile is enabled. The sonar task will not depend on sonarResolver tasks.");
sonarTask.mustRunAfter(getClassPathResolverTask(project));
sonarTask.setResolverFiles(Collections.emptyList());
} else {
sonarTask.dependsOn(getClassPathResolverTask(project));
}
}

private static boolean isSkipCompile(Project project) {
String sysProp = System.getProperty("sonar.gradle.skipCompile");
if ("true".equalsIgnoreCase(sysProp)) {
return true;
}
Object projectProp = project.findProperty("sonar.gradle.skipCompile");
return projectProp != null && "true".equalsIgnoreCase(projectProp.toString());
}

private static boolean isGradleVersionGreaterOrEqualTo(String version) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/sonarqube/gradle/SonarResolverTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ void run() throws IOException {
return;
}

outputDirectory.mkdirs();

String displayName = getProjectName();
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Resolving properties for " + displayName + ".");
Expand Down
19 changes: 19 additions & 0 deletions src/test/groovy/org/sonarqube/gradle/SonarQubePluginTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,25 @@ class SonarQubePluginTest extends Specification {
mustRunAfterTasks(sonarTask).containsAll(["root:test", "root:compileJava", "root:compileTestJava"])
}

def "The sonar task should have no dependency when skipCompile is enabled"() {
setup:
System.setProperty("sonar.gradle.skipCompile", "true")
def rootProject = ProjectBuilder.builder().withName("root").build()
rootProject.pluginManager.apply(JavaPlugin)

when:
rootProject.pluginManager.apply(SonarQubePlugin)

then:
def sonarTask = rootProject.tasks.sonar
dependsOnTasks(sonarTask) == []
mustRunAfterTasks(sonarTask).size() == 4
mustRunAfterTasks(sonarTask).containsAll(["root:test", "root:compileJava", "root:compileTestJava", "root:sonarResolver"])

cleanup:
System.clearProperty("sonar.gradle.skipCompile")
}

private List<String> mustRunAfterTasks(Task sonarTask) {
sonarTask.getMustRunAfter().getDependencies(sonarTask)
.stream()
Expand Down
Loading