Move resources: remove includes from src to resources, include resource folder in custom build scripts

buildSrc/src/main/kotlin/sourceSets.kt

@@ -32,9 +32,7 @@ val SourceSet.projectDefault: Project.() -> Unit
         when (this@projectDefault.name) {
             "main" -> {
                 java.srcDirs("src")
-                val processResources = tasks.getByName(processResourcesTaskName) as ProcessResources
+                this@projectDefault.resources.srcDir("resources")
-                processResources.from("resources") { include("**") }
-                processResources.from("src") { include("META-INF/**", "**/*.properties") }
             }
             "test" -> {
                 java.srcDirs("test", "tests")

compiler/build.gradle.kts

@@ -84,7 +84,7 @@ sourceSets {
 }
 
 val jar: Jar by tasks
-jar.from("../idea/src") {
+jar.from("../idea/resources") {
     include("META-INF/extensions/compiler.xml")
 }
 

idea/build.gradle.kts

@@ -124,7 +124,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/build.gradle.kts.173

@@ -123,7 +123,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/build.gradle.kts.as31

@@ -124,7 +124,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/build.gradle.kts.as32

@@ -124,7 +124,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/build.gradle.kts.as33

@@ -124,7 +124,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/build.gradle.kts.as34

@@ -124,7 +124,11 @@ sourceSets {
             "idea-live-templates/src",
             "idea-repl/src"
         )
-        resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
+        resources.srcDirs(
+            "idea-completion/resources",
+            "idea-live-templates/resources",
+            "idea-repl/resources"
+        )
     }
     "test" {
         projectDefault()

idea/idea-core/build.gradle.kts

@@ -34,7 +34,7 @@ sourceSets {
     "main" {
         projectDefault()
         java.srcDir("../idea-analysis/src")
-        resources.srcDir("../idea-analysis/src").apply { include("**/*.properties") }
+        resources.srcDir("../idea-analysis/resources")
     }
     "test" {}
 }