IDE: Cleanup Idea excludes (#7223)

projectnessie · Jul 12, 2023 · 9885791 · 9885791
1 parent 0f4131c
commit 9885791
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 36 deletions.
diff --git a/build-logic/src/main/kotlin/nessie-common-src.gradle.kts b/build-logic/src/main/kotlin/nessie-common-src.gradle.kts
@@ -141,32 +141,3 @@ plugins.withType<JavaPlugin>().configureEach {
     }
   }
 }
-
-// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// IDE
-
-if (!System.getProperty("idea.sync.active").toBoolean()) {
-  idea {
-    module {
-      // Do not index the following folders
-      excludeDirs =
-        excludeDirs +
-          setOf(
-            buildDir.resolve("libs"),
-            buildDir.resolve("reports"),
-            buildDir.resolve("test-results"),
-            buildDir.resolve("classes"),
-            buildDir.resolve("jacoco"),
-            buildDir.resolve("jandex"),
-            buildDir.resolve("quarkus-app"),
-            buildDir.resolve("generated"),
-            buildDir.resolve("docs"),
-            buildDir.resolve("jacoco-report"),
-            buildDir.resolve("openapi"),
-            buildDir.resolve("openapi-extra"),
-            buildDir.resolve("spotless"),
-            buildDir.resolve("tmp")
-          )
-    }
-  }
-}
diff --git a/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-root.gradle.kts
@@ -48,12 +48,6 @@ if (System.getProperty("idea.sync.active").toBoolean()) {
       val integrationsDir = projectDir.resolve("integrations")
       val sparkExtensionsDir = integrationsDir.resolve("spark-extensions")
       integrationsDir.resolve("spark-scala.properties").reader().use { sparkScalaProps.load(it) }
-      val sparkExtensionsBuildDirs =
-        sparkScalaProps
-          .getProperty("sparkVersions")
-          .split(",")
-          .map { sparkVersion -> sparkExtensionsDir.resolve("v$sparkVersion/build") }
-          .toSet()
       val buildToolsIT = projectDir.resolve("build-tools-integration-tests")
       excludeDirs =
         excludeDirs +
@@ -71,7 +65,12 @@ if (System.getProperty("idea.sync.active").toBoolean()) {
             integrationsDir.resolve("spark-extensions-base/build"),
             integrationsDir.resolve("spark-extensions-basetests/build")
           ) +
-          sparkExtensionsBuildDirs
+          allprojects.map { prj -> prj.buildDir } +
+          sparkScalaProps
+            .getProperty("sparkVersions")
+            .split(",")
+            .map { sparkVersion -> sparkExtensionsDir.resolve("v$sparkVersion/build") }
+            .toSet()
     }
 
     this.project.settings {