From b6571cbcf699eb5f3d603f7ff933ad0281ae8933 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 27 Nov 2018 10:11:14 +0300 Subject: [PATCH] Move resources from /src to separate /resources directory. Previously this files was stored in /src directory and was included in resources mainly by SourceSet.projectDefault from sourceSets.kt: val processResources = tasks.getByName(processResourcesTaskName) as ProcessResources processResources.from("resources") { include("**") } processResources.from("src") { include("META-INF/**", "**/*.properties") } Also there are some custom rules like this: resources.srcDir("../idea-analysis/src").apply { include("**/*.properties") } resources.srcDirs("idea-repl/src").apply { include("META-INF/**") } All this rules are synthesized in script https://github.com/snrostov/kotlin-migrate-resources/blob/master/src/main/kotlin/main.kt This commit created using that script. See README.md for more details on script. Original commit: df2e4524d7d79b8463afe8ad125fda8238298d45 --- .../org.jetbrains.jps.builders.AdditionalRootsProviderService | 0 .../services/org.jetbrains.jps.builders.java.JavaBuilderExtension | 0 .../org.jetbrains.jps.builders.java.JavaBuilderExtension.173 | 0 .../org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 | 0 ...ains.jps.builders.java.dependencyView.AnnotationsChangeTracker | 0 .../services/org.jetbrains.jps.incremental.BuilderService | 0 ....jetbrains.jps.model.serialization.JpsModelSerializerExtension | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.incremental.BuilderService (100%) rename jps/jps-plugin/{src => resources}/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension (100%) diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32 diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension similarity index 100% rename from jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension rename to jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension