Apache Lucene open-source search software
Try to detect sync and build phases within intellij and act accordingly to support both modes of compilation (gradle and intellij).
Dawid Weiss13e10eaae230
diff --git a/gradle/ide/intellij-idea.gradle b/gradle/ide/intellij-idea.gradleindex 589aaec3562..f9e7d1d456e 100644--- a/gradle/ide/intellij-idea.gradle+++ b/gradle/ide/intellij-idea.gradle@@ -15,23 +15,46 @@* limitations under the License.*/-// Try to detect IntelliJ model loader ("reimport") early.-rootProject.ext.isIdea = System.getProperty("idea.active") != null ||- gradle.startParameter.taskNames.contains('idea') ||- gradle.startParameter.taskNames.contains('cleanIdea')+// Try to detect IntelliJ model loader project structure "sync"+//+rootProject.ext.isIdea = Boolean.parseBoolean(System.getProperty("idea.active", "false"))+rootProject.ext.isIdeaSync = Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))+rootProject.ext.isIdeaBuild = (isIdea && !isIdeaSync)if (isIdea) {logger.warn("IntelliJ Idea IDE detected.")++ allprojects {+ apply plugin: 'idea'++ idea {+ module {+ outputDir file('build/idea/classes/main')+ testOutputDir file('build/idea/classes/test')+ downloadSources = true+ }+ }+ }}-allprojects {- apply plugin: 'idea'+if (isIdeaBuild) {+ // Skip certain long tasks that are dependencies+ // of 'assemble' if we're building from within IntelliJ.+ gradle.taskGraph.whenReady { taskGraph ->+ def tasks = taskGraph.getAllTasks()++ def skipTasks = [+ // Skip site javadoc rendering+ ".*:(renderSiteJavadoc)",+ ]- idea {- module {- outputDir file('build/idea/classes/main')- testOutputDir file('build/idea/classes/test')- downloadSources = true+ logger.lifecycle("Skipping certain tasks on IntelliJ builds")+ tasks.each { task ->+ def taskPath = task.path+ if (skipTasks.any { pattern -> taskPath ==~ pattern }) {+ logger.debug("Skipping task on IntelliJ: " + taskPath)+ task.enabled = false+ }}}}diff --git a/gradle/java/modules.gradle b/gradle/java/modules.gradleindex 768bf1a4635..f9ebac3d345 100644--- a/gradle/java/modules.gradle+++ b/gradle/java/modules.gradle@@ -76,7 +76,7 @@ allprojects {// LUCENE-10304: if we modify the classpath here, IntelliJ no longer sees the dependencies as compile-time// dependencies, don't know why.- if (!rootProject.ext.isIdea) {+ if (!rootProject.ext.isIdeaSync) {task.classpath = modularPaths.compilationClasspath}@@ -119,7 +119,7 @@ allprojects {// LUCENE-10304: if we modify the classpath here, IntelliJ no longer sees the dependencies as compile-time// dependencies, don't know why.- if (!rootProject.ext.isIdea) {+ if (!rootProject.ext.isIdeaSync) {def jarTask = project.tasks.getByName(mainSourceSet.getJarTaskName())def testJarTask = project.tasks.getByName(testSourceSet.getJarTaskName())