Permalink
Browse files

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.
  • Loading branch information...
snrostov committed Nov 27, 2018
1 parent 093b9d1 commit df2e4524d7d79b8463afe8ad125fda8238298d45
Showing with 0 additions and 0 deletions.
  1. 0 ...urces}/META-INF/services/org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper
  2. 0 ...rces}/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
  3. 0 compiler/cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.util.ModuleVisibilityHelper
  4. 0 ...iler/frontend.script/{src → resources}/META-INF/services/org.jetbrains.kotlin.script.ScriptHelper
  5. 0 .../{src → resources}/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition
  6. 0 .../deserialization/{src → resources}/META-INF/services/org.jetbrains.kotlin.builtins.BuiltInsLoader
  7. 0 .../{src → resources}/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
  8. 0 ...ling/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  9. 0 idea/{src → resources}/META-INF/android-lint.xml
  10. 0 idea/{src → resources}/META-INF/android-lint.xml.173
  11. 0 idea/{src → resources}/META-INF/android-lint.xml.as31
  12. 0 idea/{src → resources}/META-INF/android-lint.xml.as32
  13. 0 idea/{src → resources}/META-INF/android-lint.xml.as33
  14. 0 idea/{src → resources}/META-INF/android-lint.xml.as34
  15. 0 idea/{src → resources}/META-INF/android.xml
  16. 0 idea/{src → resources}/META-INF/android.xml.173
  17. 0 idea/{src → resources}/META-INF/android.xml.as31
  18. 0 idea/{src → resources}/META-INF/android.xml.as32
  19. 0 idea/{src → resources}/META-INF/coverage.xml
  20. 0 idea/{src → resources}/META-INF/decompiler.xml
  21. 0 idea/{src → resources}/META-INF/extensions/compiler.xml
  22. 0 idea/{src → resources}/META-INF/extensions/ide.xml
  23. 0 idea/{src → resources}/META-INF/extensions/ide.xml.as33
  24. 0 idea/{src → resources}/META-INF/extensions/ide.xml.as34
  25. 0 idea/{src → resources}/META-INF/git4idea.xml
  26. 0 idea/{src → resources}/META-INF/git4idea.xml.181
  27. 0 idea/{src → resources}/META-INF/git4idea.xml.as33
  28. 0 idea/{src → resources}/META-INF/git4idea.xml.as34
  29. 0 idea/{src → resources}/META-INF/gradle-java.xml
  30. 0 idea/{src → resources}/META-INF/gradle-java.xml.181
  31. 0 idea/{src → resources}/META-INF/gradle-java.xml.as33
  32. 0 idea/{src → resources}/META-INF/gradle-java.xml.as34
  33. 0 idea/{src → resources}/META-INF/gradle.xml
  34. 0 idea/{src → resources}/META-INF/gradle.xml.173
  35. 0 idea/{src → resources}/META-INF/gradle.xml.181
  36. 0 idea/{src → resources}/META-INF/i18n.xml
  37. 0 idea/{src → resources}/META-INF/injection.xml
  38. 0 idea/{src → resources}/META-INF/javaScriptDebug.xml
  39. 0 idea/{src → resources}/META-INF/junit.xml
  40. 0 idea/{src → resources}/META-INF/jvm.xml
  41. 0 idea/{src → resources}/META-INF/jvm.xml.181
  42. 0 idea/{src → resources}/META-INF/kotlin-copyright.xml
  43. 0 idea/{src → resources}/META-INF/kotlinx-serialization.xml
  44. 0 idea/{src → resources}/META-INF/maven.xml
  45. 0 idea/{src → resources}/META-INF/native.xml
  46. 0 idea/{src → resources}/META-INF/plugin-common.xml
  47. 0 idea/{src → resources}/META-INF/plugin-kotlin-extensions.xml
  48. 0 idea/{src → resources}/META-INF/plugin.xml
  49. 0 idea/{src → resources}/META-INF/plugin.xml.173
  50. 0 idea/{src → resources}/META-INF/plugin.xml.181
  51. 0 idea/{src → resources}/META-INF/plugin.xml.183
  52. 0 idea/{src → resources}/META-INF/plugin.xml.as31
  53. 0 idea/{src → resources}/META-INF/plugin.xml.as32
  54. 0 idea/{src → resources}/META-INF/plugin.xml.as33
  55. 0 idea/{src → resources}/META-INF/plugin.xml.as34
  56. 0 idea/{src → resources}/META-INF/pluginIcon.svg
  57. 0 ... → resources}/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
  58. 0 ...rces}/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
  59. 0 idea/{src → resources}/META-INF/stream-debugger.xml
  60. 0 idea/{src → resources}/META-INF/testng-j.xml
  61. 0 idea/{src → resources}/META-INF/tipsAndTricks.xml
  62. 0 idea/{src → resources}/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.properties
  63. 0 ...gin/{src → resources}/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService
  64. 0 jps-plugin/{src → resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension
  65. 0 ...ugin/{src → resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173
  66. 0 ...gin/{src → resources}/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.as32
  67. 0 ...ources}/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker
  68. 0 jps-plugin/{src → resources}/META-INF/services/org.jetbrains.jps.incremental.BuilderService
  69. 0 ... → resources}/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
  70. 0 ...adata/jvm/{src → resources}/META-INF/services/kotlinx.metadata.impl.extensions.MetadataExtensions
  71. 0 ...cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  72. 0 ...n-cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  73. 0 ...-ide/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  74. 0 ...ler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  75. 0 ...piler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  76. 0 ...idea/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  77. 0 ... → resources}/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
  78. 0 ... → resources}/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
  79. 0 ...per/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  80. 0 ...umper/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  81. 0 ...ler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  82. 0 ...piler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  83. 0 ...idea/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  84. 0 ...piler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  85. 0 ...cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  86. 0 ...g-cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  87. 0 ...-ide/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  88. 0 ...cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  89. 0 ...r-cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  90. 0 ...-ide/{src → resources}/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
  91. 0 ...cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  92. 0 ...g-cli/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
  93. 0 ...ler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
  94. 0 ...piler/{src → resources}/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar

0 comments on commit df2e452

Please sign in to comment.