From 74f6c8ac5c28ad0ca79d75c1471a400915fbddc3 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 27 Nov 2018 10:21:52 +0300 Subject: [PATCH] Move resources: remove includes from src to resources, include resource folder in custom build scripts --- buildSrc/src/main/kotlin/sourceSets.kt | 4 +--- compiler/build.gradle.kts | 2 +- idea/build.gradle.kts | 6 +++++- idea/build.gradle.kts.173 | 6 +++++- idea/build.gradle.kts.as31 | 6 +++++- idea/build.gradle.kts.as32 | 6 +++++- idea/build.gradle.kts.as33 | 6 +++++- idea/build.gradle.kts.as34 | 6 +++++- .../org/jetbrains/kotlin/idea/KotlinBundle.properties | 0 idea/idea-core/build.gradle.kts | 2 +- .../META-INF/services/javax.script.ScriptEngineFactory | 0 11 files changed, 33 insertions(+), 11 deletions(-) rename idea/idea-analysis/{src => resources}/org/jetbrains/kotlin/idea/KotlinBundle.properties (100%) rename idea/idea-repl/{src => resources}/META-INF/services/javax.script.ScriptEngineFactory (100%) diff --git a/buildSrc/src/main/kotlin/sourceSets.kt b/buildSrc/src/main/kotlin/sourceSets.kt index 98a2721121a..1296409eb4f 100644 --- a/buildSrc/src/main/kotlin/sourceSets.kt +++ b/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 - processResources.from("resources") { include("**") } - processResources.from("src") { include("META-INF/**", "**/*.properties") } + this@projectDefault.resources.srcDir("resources") } "test" -> { java.srcDirs("test", "tests") diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 02f386d7d7e..a04df5861ac 100644 --- a/compiler/build.gradle.kts +++ b/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") } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index d1ab3a115a4..53a2bb209e2 100644 --- a/idea/build.gradle.kts +++ b/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() diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173 index 1f2d57b4235..5f5a8f04adc 100644 --- a/idea/build.gradle.kts.173 +++ b/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() diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 index 0aaed569a1a..974a63a2659 100644 --- a/idea/build.gradle.kts.as31 +++ b/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() diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32 index 2845f66c050..2e5678d4159 100644 --- a/idea/build.gradle.kts.as32 +++ b/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() diff --git a/idea/build.gradle.kts.as33 b/idea/build.gradle.kts.as33 index 21aadc0c32a..5c6ec076e70 100644 --- a/idea/build.gradle.kts.as33 +++ b/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() diff --git a/idea/build.gradle.kts.as34 b/idea/build.gradle.kts.as34 index 21aadc0c32a..5c6ec076e70 100644 --- a/idea/build.gradle.kts.as34 +++ b/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() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties similarity index 100% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties rename to idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 3ab6b1a9b9c..7808afe84f2 100644 --- a/idea/idea-core/build.gradle.kts +++ b/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" {} } diff --git a/idea/idea-repl/src/META-INF/services/javax.script.ScriptEngineFactory b/idea/idea-repl/resources/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from idea/idea-repl/src/META-INF/services/javax.script.ScriptEngineFactory rename to idea/idea-repl/resources/META-INF/services/javax.script.ScriptEngineFactory