You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/07/26 20:33:39 UTC
(grails-intellij-plugin) 19/35: Move libs and compiler tiers, and drop the unused raster icons
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/grails-intellij-plugin.git
commit 897b2e068a7fd7bb722370ac04beae25b2da6d26
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Sun Jul 26 12:12:06 2026 -0400
Move libs and compiler tiers, and drop the unused raster icons
Step 5 of the restructure. gradle-tooling, grails-rt and testFramework move to
libs/*; jps-plugin and grails-compiler-patch move to libs/compiler/*, with
src/ -> src/main/java and resources/ -> src/main/resources throughout. Project
names carry their subpath (:libs-grails-rt, :libs-compiler-jps-plugin) with
directories remapped via projectDir.
The invariants all held across the move, checked rather than assumed:
packaged artifact names byte-identical to the pre-move clean build
compileServer classpath both entries still resolve to real jars in lib/
bytecode levels 52/52/52 and 55, unchanged
grails-rt agent manifest Premain-Class still present
tests 987 / 0 failures
RAT clean
RAT needed a fourth depth glob: libs/compiler/<project>/build sits one level
deeper than anything before it, and Ant patterns do not cross '/'. Without
'*/*/*/build/**' the audit would have started scanning compiler build output.
Also removes compatibilityResources/ -- 16 raster icons that shipped but were
unreachable. Evidence: the generated GroovyMvcIcons loads only .svg paths, an
exhaustive sweep of src/gen/resources/pluginModules/libs finds exactly nine
icons/ references and all nine are .svg, XML refers to icons through the
generated accessor rather than by path, and there are no IconLoader call sites at
all, so nothing can resolve an icon by base name. @2x variants are a raster-only
concept -- SVG scales intrinsically -- and 12 of the 16 files were @2x or _dark
variants, so they only ever made sense in the pre-SVG scheme. sinceBuild is 262,
years past the platform's SVG migration, so no supported target needs fallbacks.
They can be regenerated from the SVGs if that ever changes, and git retains them.
Verified after removal that all nine icon paths GroovyMvcIcons loads still
resolve inside the packaged jar: PNG count 16 -> 0, SVG count unchanged at 10.
That was the last non-standard resources root, so legacy-layout is now down to
src/, gen/, resources/ and test/ for the plugin project alone; it can be deleted
once that project moves.
---
...pache.grails.intellij.build.legacy-layout.gradle | 5 ++---
.../org.apache.grails.intellij.build.rat.gradle | 6 ++++--
build.gradle | 20 ++++++++++----------
compatibilityResources/icons/grails.png | Bin 312 -> 0 bytes
compatibilityResources/icons/grails@2x.png | Bin 588 -> 0 bytes
compatibilityResources/icons/grails_13.png | Bin 300 -> 0 bytes
compatibilityResources/icons/grails_13@2x.png | Bin 562 -> 0 bytes
compatibilityResources/icons/grails_app.png | Bin 346 -> 0 bytes
compatibilityResources/icons/grails_app@2x.png | Bin 672 -> 0 bytes
compatibilityResources/icons/grails_app@2x_dark.png | Bin 671 -> 0 bytes
compatibilityResources/icons/grails_app_dark.png | Bin 347 -> 0 bytes
compatibilityResources/icons/grails_sdk.png | Bin 281 -> 0 bytes
compatibilityResources/icons/grails_sdk@2x.png | Bin 519 -> 0 bytes
compatibilityResources/icons/grails_test.png | Bin 399 -> 0 bytes
compatibilityResources/icons/grails_test@2x.png | Bin 740 -> 0 bytes
compatibilityResources/icons/gsp_logo.png | Bin 216 -> 0 bytes
compatibilityResources/icons/gsp_logo@2x.png | Bin 384 -> 0 bytes
compatibilityResources/icons/taglib.png | Bin 289 -> 0 bytes
compatibilityResources/icons/taglib@2x.png | Bin 501 -> 0 bytes
.../compiler/grails-compiler-patch}/README.md | 0
.../compiler/grails-compiler-patch}/build.gradle | 1 -
.../grails/compiler/EmptyGrailsAwarePatcher.java | 0
.../grails/compiler/Grails2_0_JUnitPatcher.java | 0
.../grails/compiler/GrailsCompilerRtMarker.java | 0
.../grails/compiler/GrailsDomainClassPatcher.java | 0
.../groovy/grails/compiler/GrailsJUnitPatcher.java | 0
.../src/main}/resources/log4j.properties | 0
{jps-plugin => libs/compiler/jps-plugin}/README.md | 0
.../compiler/jps-plugin}/build.gradle | 3 +--
.../jps/grails/builder/GrailsBuilderExtension.java | 0
...ns.jps.incremental.groovy.GroovyBuilderExtension | 0
{gradle-tooling => libs/gradle-tooling}/README.md | 0
.../gradle-tooling}/build.gradle | 1 -
.../grails/gradle/tooling/builder/GrailsModule.java | 0
.../gradle/tooling/builder/GrailsModuleImpl.java | 0
.../builder/GrailsModuleModelBuilderImpl.java | 0
...rains.plugins.gradle.tooling.ModelBuilderService | 0
{grails-rt => libs/grails-rt}/README.md | 0
{grails-rt => libs/grails-rt}/build.gradle | 1 -
.../rt/AddAgentJarToClassPathTransformer.java | 0
.../java}/org/jetbrains/groovy/grails/rt/Agent.java | 0
.../org/jetbrains/groovy/grails/rt/AgentUtils.java | 0
.../groovy/grails/rt/ForkListenerTransformer.java | 0
.../groovy/grails/rt/GrailsIdeaTestListener.java | 0
.../jetbrains/groovy/grails/rt/GrailsRtMarker.java | 0
.../META-INF/commands/intellij-command-proxy.groovy | 0
.../src/main}/resources/idea-injected-traits.groovy | 0
{testFramework => libs/testFramework}/README.md | 0
{testFramework => libs/testFramework}/build.gradle | 1 -
.../service/execution/TestUnknownSdkResolver.kt | 0
.../externalSystem/test/JavaCompileTestUtil.kt | 0
.../test/JavaExternalSystemImportingTestCase.kt | 0
.../util/ExternalSystemFileTestUtil.kt | 0
.../openapi/roots/ui/configuration/SdkTestCase.kt | 0
.../testFramework/eelJava/EelTestJdkProvider.kt | 0
.../platform/testFramework/eelJava/EelTestUtil.kt | 0
.../gradle/importing/GradleImportingTestCase.kt | 0
.../gradle/importing/TestGradleBuildScripBuilder.kt | 0
.../importing/TestGradleSettingsScriptHelper.kt | 0
.../plugins/gradle/tooling/GradleJvmResolver.kt | 0
.../plugins/gradle/tooling/JavaVersionMatcher.kt | 0
.../gradle/tooling/JavaVersionRestriction.kt | 0
.../gradle/tooling/TargetJavaVersionWatcher.java | 0
.../plugins/gradle/tooling/VersionMatcherRule.java | 0
.../tooling/annotation/TargetJavaVersion.java | 0
.../gradle/tooling/annotation/TargetVersions.java | 0
...radleBrokenJvmSerialisationVersionRestriction.kt | 0
.../jvm/GradleToolingApi9VersionRestriction.kt | 0
.../plugins/gradle/tooling/util/VersionMatcher.java | 0
.../plugins/gradle/util/testWrapperUtil.kt | 0
.../plugins/groovy/CompoundTestLibrary.java | 0
.../plugins/groovy/GroovyProjectDescriptors.java | 0
.../groovy/LibraryLightProjectDescriptor.java | 0
.../plugins/groovy/LightGroovyTestCase.java | 0
.../plugins/groovy/RepositoryTestLibrary.java | 0
.../org/jetbrains/plugins/groovy/TestLibrary.java | 0
.../groovy/completion/CompletionTestBase.java | 0
.../plugins/groovy/grails/Grails14TestCase.java | 0
.../plugins/groovy/grails/GrailsTestCase.java | 0
.../plugins/groovy/grails/GrailsTestUtil.java | 0
.../plugins/groovy/grails/HddGrailsTestCase.java | 0
.../grails/TestGrailsApplicationProvider.java | 0
.../groovy/lang/GroovyFormatterTestCase.java | 0
.../lang/highlighting/GrHighlightingTestBase.java | 0
.../jetbrains/plugins/groovy/util/TestUtils.java | 0
pluginModules/maven/build.gradle | 2 +-
settings.gradle | 15 ++++++++++-----
87 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.grails.intellij.build.legacy-layout.gradle b/build-logic/src/main/groovy/org.apache.grails.intellij.build.legacy-layout.gradle
index 663f4f0..8f29e3d 100644
--- a/build-logic/src/main/groovy/org.apache.grails.intellij.build.legacy-layout.gradle
+++ b/build-logic/src/main/groovy/org.apache.grails.intellij.build.legacy-layout.gradle
@@ -18,13 +18,13 @@
*/
// TRANSITIONAL. Declares the pre-restructure source layout inherited from the JetBrains JPS
-// monorepo (src/, gen/, resources/, compatibilityResources/, test/) so that the convention
+// monorepo (src/, gen/, resources/, test/) so that the convention
// plugins can be introduced before any files move.
//
// Every project applies this while the restructure is in flight; it is deleted once all three
// tiers have been normalized to src/main/java, src/main/resources and src/test/java. Declaring
// a srcDir that does not exist is harmless, so one shared block covers all projects even
-// though only the plugin project has gen/, compatibilityResources/ and test/.
+// though only the plugin project has gen/ and test/.
//
// Do NOT add anything here that is not purely about the old layout.
@@ -32,7 +32,6 @@ sourceSets.named('main') { main ->
main.java.srcDir 'src'
main.java.srcDir 'gen'
main.resources.srcDir 'resources'
- main.resources.srcDir 'compatibilityResources'
}
sourceSets.named('test') { test ->
diff --git a/build-logic/src/main/groovy/org.apache.grails.intellij.build.rat.gradle b/build-logic/src/main/groovy/org.apache.grails.intellij.build.rat.gradle
index 883d127..b862c40 100644
--- a/build-logic/src/main/groovy/org.apache.grails.intellij.build.rat.gradle
+++ b/build-logic/src/main/groovy/org.apache.grails.intellij.build.rat.gradle
@@ -82,11 +82,13 @@ tasks.named('rat') { task ->
'**/META-INF/MANIFEST.MF',
// build outputs are generated and never shipped in the source distro. Anchored to
// explicit depths rather than "**/build/**" so a source package named "build" would
- // still be audited. Three levels are needed: the root, the tier directories, and the
- // nested projects under pluginModules/ and libs/.
+ // still be audited. Four levels are needed: the root, the tier directories, the
+ // projects under pluginModules/ and libs/, and the compiler projects one level
+ // deeper again at libs/compiler/<project>/build.
'build/**',
'*/build/**',
'*/*/build/**',
+ '*/*/*/build/**',
])
// Never let a license audit be skipped. upToDateWhen alone is not enough: RatTask is
// @CacheableTask and org.gradle.caching=true, so a build-cache hit would skip the audit
diff --git a/build.gradle b/build.gradle
index 665ee4c..8ba5ac2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,27 +67,27 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:4.0.0-M1'
- testImplementation project(':testFramework')
+ testImplementation project(':libs-testFramework')
testCompileOnly project(':pluginModules-i18n')
testCompileOnly project(':pluginModules-copyright')
- implementation project(':gradle-tooling')
- implementation project(':grails-rt')
+ implementation project(':libs-gradle-tooling')
+ implementation project(':libs-grails-rt')
// JPS/build
- runtimeOnly project(':grails-compiler-patch')
- runtimeOnly project(':jps-plugin')
+ runtimeOnly project(':libs-compiler-grails-compiler-patch')
+ runtimeOnly project(':libs-compiler-jps-plugin')
// Aggregate JaCoCo coverage from every module into the root testCodeCoverageReport.
jacocoAggregation project(':pluginModules-copyright')
jacocoAggregation project(':pluginModules-coverage')
- jacocoAggregation project(':gradle-tooling')
- jacocoAggregation project(':grails-compiler-patch')
- jacocoAggregation project(':grails-rt')
+ jacocoAggregation project(':libs-gradle-tooling')
+ jacocoAggregation project(':libs-compiler-grails-compiler-patch')
+ jacocoAggregation project(':libs-grails-rt')
jacocoAggregation project(':pluginModules-hibernate')
jacocoAggregation project(':pluginModules-i18n')
- jacocoAggregation project(':jps-plugin')
+ jacocoAggregation project(':libs-compiler-jps-plugin')
jacocoAggregation project(':pluginModules-langInjection')
jacocoAggregation project(':pluginModules-maven')
- jacocoAggregation project(':testFramework')
+ jacocoAggregation project(':libs-testFramework')
}
diff --git a/compatibilityResources/icons/grails.png b/compatibilityResources/icons/grails.png
deleted file mode 100644
index 3a6c2c6..0000000
Binary files a/compatibilityResources/icons/grails.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails@2x.png b/compatibilityResources/icons/grails@2x.png
deleted file mode 100644
index c56b209..0000000
Binary files a/compatibilityResources/icons/grails@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_13.png b/compatibilityResources/icons/grails_13.png
deleted file mode 100644
index 3c2e54a..0000000
Binary files a/compatibilityResources/icons/grails_13.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_13@2x.png b/compatibilityResources/icons/grails_13@2x.png
deleted file mode 100644
index 1370386..0000000
Binary files a/compatibilityResources/icons/grails_13@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_app.png b/compatibilityResources/icons/grails_app.png
deleted file mode 100644
index 017bf63..0000000
Binary files a/compatibilityResources/icons/grails_app.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_app@2x.png b/compatibilityResources/icons/grails_app@2x.png
deleted file mode 100644
index 4a1dae5..0000000
Binary files a/compatibilityResources/icons/grails_app@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_app@2x_dark.png b/compatibilityResources/icons/grails_app@2x_dark.png
deleted file mode 100644
index 0bd70b7..0000000
Binary files a/compatibilityResources/icons/grails_app@2x_dark.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_app_dark.png b/compatibilityResources/icons/grails_app_dark.png
deleted file mode 100644
index 8d9c8f2..0000000
Binary files a/compatibilityResources/icons/grails_app_dark.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_sdk.png b/compatibilityResources/icons/grails_sdk.png
deleted file mode 100644
index 9b7b783..0000000
Binary files a/compatibilityResources/icons/grails_sdk.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_sdk@2x.png b/compatibilityResources/icons/grails_sdk@2x.png
deleted file mode 100644
index 731d253..0000000
Binary files a/compatibilityResources/icons/grails_sdk@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_test.png b/compatibilityResources/icons/grails_test.png
deleted file mode 100644
index 830e260..0000000
Binary files a/compatibilityResources/icons/grails_test.png and /dev/null differ
diff --git a/compatibilityResources/icons/grails_test@2x.png b/compatibilityResources/icons/grails_test@2x.png
deleted file mode 100644
index d2ec854..0000000
Binary files a/compatibilityResources/icons/grails_test@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/gsp_logo.png b/compatibilityResources/icons/gsp_logo.png
deleted file mode 100644
index c38ce30..0000000
Binary files a/compatibilityResources/icons/gsp_logo.png and /dev/null differ
diff --git a/compatibilityResources/icons/gsp_logo@2x.png b/compatibilityResources/icons/gsp_logo@2x.png
deleted file mode 100644
index d30e6c6..0000000
Binary files a/compatibilityResources/icons/gsp_logo@2x.png and /dev/null differ
diff --git a/compatibilityResources/icons/taglib.png b/compatibilityResources/icons/taglib.png
deleted file mode 100644
index 8e5bbb7..0000000
Binary files a/compatibilityResources/icons/taglib.png and /dev/null differ
diff --git a/compatibilityResources/icons/taglib@2x.png b/compatibilityResources/icons/taglib@2x.png
deleted file mode 100644
index 814c2cf..0000000
Binary files a/compatibilityResources/icons/taglib@2x.png and /dev/null differ
diff --git a/grails-compiler-patch/README.md b/libs/compiler/grails-compiler-patch/README.md
similarity index 100%
rename from grails-compiler-patch/README.md
rename to libs/compiler/grails-compiler-patch/README.md
diff --git a/grails-compiler-patch/build.gradle b/libs/compiler/grails-compiler-patch/build.gradle
similarity index 96%
rename from grails-compiler-patch/build.gradle
rename to libs/compiler/grails-compiler-patch/build.gradle
index f5c8e94..ed8cd5c 100644
--- a/grails-compiler-patch/build.gradle
+++ b/libs/compiler/grails-compiler-patch/build.gradle
@@ -16,7 +16,6 @@
plugins {
id 'org.apache.grails.intellij.build.compiler'
id 'org.apache.grails.intellij.build.java-legacy'
- id 'org.apache.grails.intellij.build.legacy-layout'
}
// runs inside user Grails/JPS builds
diff --git a/grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/EmptyGrailsAwarePatcher.java b/libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/EmptyGrailsAwarePatcher.java
similarity index 100%
rename from grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/EmptyGrailsAwarePatcher.java
rename to libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/EmptyGrailsAwarePatcher.java
diff --git a/grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/Grails2_0_JUnitPatcher.java b/libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/Grails2_0_JUnitPatcher.java
similarity index 100%
rename from grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/Grails2_0_JUnitPatcher.java
rename to libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/Grails2_0_JUnitPatcher.java
diff --git a/grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsCompilerRtMarker.java b/libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsCompilerRtMarker.java
similarity index 100%
rename from grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsCompilerRtMarker.java
rename to libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsCompilerRtMarker.java
diff --git a/grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsDomainClassPatcher.java b/libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsDomainClassPatcher.java
similarity index 100%
rename from grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsDomainClassPatcher.java
rename to libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsDomainClassPatcher.java
diff --git a/grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsJUnitPatcher.java b/libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsJUnitPatcher.java
similarity index 100%
rename from grails-compiler-patch/src/org/jetbrains/groovy/grails/compiler/GrailsJUnitPatcher.java
rename to libs/compiler/grails-compiler-patch/src/main/java/org/jetbrains/groovy/grails/compiler/GrailsJUnitPatcher.java
diff --git a/grails-compiler-patch/resources/log4j.properties b/libs/compiler/grails-compiler-patch/src/main/resources/log4j.properties
similarity index 100%
rename from grails-compiler-patch/resources/log4j.properties
rename to libs/compiler/grails-compiler-patch/src/main/resources/log4j.properties
diff --git a/jps-plugin/README.md b/libs/compiler/jps-plugin/README.md
similarity index 100%
rename from jps-plugin/README.md
rename to libs/compiler/jps-plugin/README.md
diff --git a/jps-plugin/build.gradle b/libs/compiler/jps-plugin/build.gradle
similarity index 89%
rename from jps-plugin/build.gradle
rename to libs/compiler/jps-plugin/build.gradle
index 145fc86..f4681e2 100644
--- a/jps-plugin/build.gradle
+++ b/libs/compiler/jps-plugin/build.gradle
@@ -16,7 +16,6 @@
plugins {
id 'org.apache.grails.intellij.build.compiler'
id 'org.apache.grails.intellij.build.java-legacy'
- id 'org.apache.grails.intellij.build.legacy-layout'
}
// runs inside the end user's JPS build process
@@ -29,5 +28,5 @@ dependencies {
bundledPlugin 'org.intellij.groovy'
}
- compileOnly project(':grails-compiler-patch')
+ compileOnly project(':libs-compiler-grails-compiler-patch')
}
diff --git a/jps-plugin/src/org/jetbrains/jps/grails/builder/GrailsBuilderExtension.java b/libs/compiler/jps-plugin/src/main/java/org/jetbrains/jps/grails/builder/GrailsBuilderExtension.java
similarity index 100%
rename from jps-plugin/src/org/jetbrains/jps/grails/builder/GrailsBuilderExtension.java
rename to libs/compiler/jps-plugin/src/main/java/org/jetbrains/jps/grails/builder/GrailsBuilderExtension.java
diff --git a/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.groovy.GroovyBuilderExtension b/libs/compiler/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.groovy.GroovyBuilderExtension
similarity index 100%
rename from jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.groovy.GroovyBuilderExtension
rename to libs/compiler/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.groovy.GroovyBuilderExtension
diff --git a/gradle-tooling/README.md b/libs/gradle-tooling/README.md
similarity index 100%
rename from gradle-tooling/README.md
rename to libs/gradle-tooling/README.md
diff --git a/gradle-tooling/build.gradle b/libs/gradle-tooling/build.gradle
similarity index 94%
rename from gradle-tooling/build.gradle
rename to libs/gradle-tooling/build.gradle
index 3a99610..2bd87c0 100644
--- a/gradle-tooling/build.gradle
+++ b/libs/gradle-tooling/build.gradle
@@ -16,7 +16,6 @@
plugins {
id 'org.apache.grails.intellij.build.intellij-lib'
id 'org.apache.grails.intellij.build.java-legacy'
- id 'org.apache.grails.intellij.build.legacy-layout'
}
// runs inside user Grails/JPS builds
diff --git a/gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModule.java b/libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModule.java
similarity index 100%
rename from gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModule.java
rename to libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModule.java
diff --git a/gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleImpl.java b/libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleImpl.java
similarity index 100%
rename from gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleImpl.java
rename to libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleImpl.java
diff --git a/gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleModelBuilderImpl.java b/libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleModelBuilderImpl.java
similarity index 100%
rename from gradle-tooling/src/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleModelBuilderImpl.java
rename to libs/gradle-tooling/src/main/java/org/jetbrains/plugins/grails/gradle/tooling/builder/GrailsModuleModelBuilderImpl.java
diff --git a/gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService b/libs/gradle-tooling/src/main/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
similarity index 100%
rename from gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
rename to libs/gradle-tooling/src/main/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
diff --git a/grails-rt/README.md b/libs/grails-rt/README.md
similarity index 100%
rename from grails-rt/README.md
rename to libs/grails-rt/README.md
diff --git a/grails-rt/build.gradle b/libs/grails-rt/build.gradle
similarity index 96%
rename from grails-rt/build.gradle
rename to libs/grails-rt/build.gradle
index f237080..d819b73 100644
--- a/grails-rt/build.gradle
+++ b/libs/grails-rt/build.gradle
@@ -16,7 +16,6 @@
plugins {
id 'org.apache.grails.intellij.build.lib'
id 'org.apache.grails.intellij.build.java-legacy'
- id 'org.apache.grails.intellij.build.legacy-layout'
}
// runs inside user Grails builds; located at runtime via GrailsRtMarker, not by name
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/AddAgentJarToClassPathTransformer.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/AddAgentJarToClassPathTransformer.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/AddAgentJarToClassPathTransformer.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/AddAgentJarToClassPathTransformer.java
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/Agent.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/Agent.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/Agent.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/Agent.java
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/AgentUtils.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/AgentUtils.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/AgentUtils.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/AgentUtils.java
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/ForkListenerTransformer.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/ForkListenerTransformer.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/ForkListenerTransformer.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/ForkListenerTransformer.java
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/GrailsIdeaTestListener.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/GrailsIdeaTestListener.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/GrailsIdeaTestListener.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/GrailsIdeaTestListener.java
diff --git a/grails-rt/src/org/jetbrains/groovy/grails/rt/GrailsRtMarker.java b/libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/GrailsRtMarker.java
similarity index 100%
rename from grails-rt/src/org/jetbrains/groovy/grails/rt/GrailsRtMarker.java
rename to libs/grails-rt/src/main/java/org/jetbrains/groovy/grails/rt/GrailsRtMarker.java
diff --git a/grails-rt/resources/META-INF/commands/intellij-command-proxy.groovy b/libs/grails-rt/src/main/resources/META-INF/commands/intellij-command-proxy.groovy
similarity index 100%
rename from grails-rt/resources/META-INF/commands/intellij-command-proxy.groovy
rename to libs/grails-rt/src/main/resources/META-INF/commands/intellij-command-proxy.groovy
diff --git a/grails-rt/resources/idea-injected-traits.groovy b/libs/grails-rt/src/main/resources/idea-injected-traits.groovy
similarity index 100%
rename from grails-rt/resources/idea-injected-traits.groovy
rename to libs/grails-rt/src/main/resources/idea-injected-traits.groovy
diff --git a/testFramework/README.md b/libs/testFramework/README.md
similarity index 100%
rename from testFramework/README.md
rename to libs/testFramework/README.md
diff --git a/testFramework/build.gradle b/libs/testFramework/build.gradle
similarity index 97%
rename from testFramework/build.gradle
rename to libs/testFramework/build.gradle
index b301a2f..da54ded 100644
--- a/testFramework/build.gradle
+++ b/libs/testFramework/build.gradle
@@ -19,7 +19,6 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
plugins {
id 'org.apache.grails.intellij.build.intellij-lib'
id 'org.apache.grails.intellij.build.kotlin'
- id 'org.apache.grails.intellij.build.legacy-layout'
}
dependencies {
diff --git a/testFramework/src/com/intellij/openapi/externalSystem/service/execution/TestUnknownSdkResolver.kt b/libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/service/execution/TestUnknownSdkResolver.kt
similarity index 100%
rename from testFramework/src/com/intellij/openapi/externalSystem/service/execution/TestUnknownSdkResolver.kt
rename to libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/service/execution/TestUnknownSdkResolver.kt
diff --git a/testFramework/src/com/intellij/openapi/externalSystem/test/JavaCompileTestUtil.kt b/libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/test/JavaCompileTestUtil.kt
similarity index 100%
rename from testFramework/src/com/intellij/openapi/externalSystem/test/JavaCompileTestUtil.kt
rename to libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/test/JavaCompileTestUtil.kt
diff --git a/testFramework/src/com/intellij/openapi/externalSystem/test/JavaExternalSystemImportingTestCase.kt b/libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/test/JavaExternalSystemImportingTestCase.kt
similarity index 100%
rename from testFramework/src/com/intellij/openapi/externalSystem/test/JavaExternalSystemImportingTestCase.kt
rename to libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/test/JavaExternalSystemImportingTestCase.kt
diff --git a/testFramework/src/com/intellij/openapi/externalSystem/util/ExternalSystemFileTestUtil.kt b/libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/util/ExternalSystemFileTestUtil.kt
similarity index 100%
rename from testFramework/src/com/intellij/openapi/externalSystem/util/ExternalSystemFileTestUtil.kt
rename to libs/testFramework/src/main/java/com/intellij/openapi/externalSystem/util/ExternalSystemFileTestUtil.kt
diff --git a/testFramework/src/com/intellij/openapi/roots/ui/configuration/SdkTestCase.kt b/libs/testFramework/src/main/java/com/intellij/openapi/roots/ui/configuration/SdkTestCase.kt
similarity index 100%
rename from testFramework/src/com/intellij/openapi/roots/ui/configuration/SdkTestCase.kt
rename to libs/testFramework/src/main/java/com/intellij/openapi/roots/ui/configuration/SdkTestCase.kt
diff --git a/testFramework/src/com/intellij/platform/testFramework/eelJava/EelTestJdkProvider.kt b/libs/testFramework/src/main/java/com/intellij/platform/testFramework/eelJava/EelTestJdkProvider.kt
similarity index 100%
rename from testFramework/src/com/intellij/platform/testFramework/eelJava/EelTestJdkProvider.kt
rename to libs/testFramework/src/main/java/com/intellij/platform/testFramework/eelJava/EelTestJdkProvider.kt
diff --git a/testFramework/src/com/intellij/platform/testFramework/eelJava/EelTestUtil.kt b/libs/testFramework/src/main/java/com/intellij/platform/testFramework/eelJava/EelTestUtil.kt
similarity index 100%
rename from testFramework/src/com/intellij/platform/testFramework/eelJava/EelTestUtil.kt
rename to libs/testFramework/src/main/java/com/intellij/platform/testFramework/eelJava/EelTestUtil.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/importing/TestGradleBuildScripBuilder.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/TestGradleBuildScripBuilder.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/importing/TestGradleBuildScripBuilder.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/TestGradleBuildScripBuilder.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/importing/TestGradleSettingsScriptHelper.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/TestGradleSettingsScriptHelper.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/importing/TestGradleSettingsScriptHelper.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/importing/TestGradleSettingsScriptHelper.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/GradleJvmResolver.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/GradleJvmResolver.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/GradleJvmResolver.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/GradleJvmResolver.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/JavaVersionMatcher.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/JavaVersionMatcher.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/JavaVersionMatcher.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/JavaVersionMatcher.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/JavaVersionRestriction.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/JavaVersionRestriction.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/JavaVersionRestriction.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/JavaVersionRestriction.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/TargetJavaVersionWatcher.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/TargetJavaVersionWatcher.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/TargetJavaVersionWatcher.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/TargetJavaVersionWatcher.java
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/VersionMatcherRule.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/VersionMatcherRule.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/VersionMatcherRule.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/VersionMatcherRule.java
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/annotation/TargetJavaVersion.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/annotation/TargetJavaVersion.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/annotation/TargetJavaVersion.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/annotation/TargetJavaVersion.java
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/annotation/TargetVersions.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/annotation/TargetVersions.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/annotation/TargetVersions.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/annotation/TargetVersions.java
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/jvm/GradleBrokenJvmSerialisationVersionRestriction.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/jvm/GradleBrokenJvmSerialisationVersionRestriction.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/jvm/GradleBrokenJvmSerialisationVersionRestriction.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/jvm/GradleBrokenJvmSerialisationVersionRestriction.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/jvm/GradleToolingApi9VersionRestriction.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/jvm/GradleToolingApi9VersionRestriction.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/jvm/GradleToolingApi9VersionRestriction.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/jvm/GradleToolingApi9VersionRestriction.kt
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/tooling/util/VersionMatcher.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/util/VersionMatcher.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/tooling/util/VersionMatcher.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/tooling/util/VersionMatcher.java
diff --git a/testFramework/src/org/jetbrains/plugins/gradle/util/testWrapperUtil.kt b/libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/util/testWrapperUtil.kt
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/gradle/util/testWrapperUtil.kt
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/gradle/util/testWrapperUtil.kt
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/CompoundTestLibrary.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/CompoundTestLibrary.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/CompoundTestLibrary.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/CompoundTestLibrary.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/GroovyProjectDescriptors.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/GroovyProjectDescriptors.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/GroovyProjectDescriptors.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/GroovyProjectDescriptors.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/LibraryLightProjectDescriptor.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/LibraryLightProjectDescriptor.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/LibraryLightProjectDescriptor.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/LibraryLightProjectDescriptor.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/LightGroovyTestCase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/LightGroovyTestCase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/LightGroovyTestCase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/LightGroovyTestCase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/RepositoryTestLibrary.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/RepositoryTestLibrary.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/RepositoryTestLibrary.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/RepositoryTestLibrary.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/TestLibrary.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/TestLibrary.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/TestLibrary.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/TestLibrary.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/completion/CompletionTestBase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/completion/CompletionTestBase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/completion/CompletionTestBase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/completion/CompletionTestBase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/grails/Grails14TestCase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/Grails14TestCase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/grails/Grails14TestCase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/Grails14TestCase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/grails/GrailsTestCase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/GrailsTestCase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/grails/GrailsTestCase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/GrailsTestCase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/grails/GrailsTestUtil.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/GrailsTestUtil.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/grails/GrailsTestUtil.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/GrailsTestUtil.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/grails/HddGrailsTestCase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/HddGrailsTestCase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/grails/HddGrailsTestCase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/HddGrailsTestCase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/grails/TestGrailsApplicationProvider.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/TestGrailsApplicationProvider.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/grails/TestGrailsApplicationProvider.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/grails/TestGrailsApplicationProvider.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/lang/GroovyFormatterTestCase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/lang/GroovyFormatterTestCase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/lang/GroovyFormatterTestCase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/lang/GroovyFormatterTestCase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/lang/highlighting/GrHighlightingTestBase.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/lang/highlighting/GrHighlightingTestBase.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/lang/highlighting/GrHighlightingTestBase.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/lang/highlighting/GrHighlightingTestBase.java
diff --git a/testFramework/src/org/jetbrains/plugins/groovy/util/TestUtils.java b/libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/util/TestUtils.java
similarity index 100%
rename from testFramework/src/org/jetbrains/plugins/groovy/util/TestUtils.java
rename to libs/testFramework/src/main/java/org/jetbrains/plugins/groovy/util/TestUtils.java
diff --git a/pluginModules/maven/build.gradle b/pluginModules/maven/build.gradle
index 79197d1..02d7032 100644
--- a/pluginModules/maven/build.gradle
+++ b/pluginModules/maven/build.gradle
@@ -25,6 +25,6 @@ dependencies {
bundledPlugin 'com.intellij.java'
}
- compileOnly project(':grails-rt')
+ compileOnly project(':libs-grails-rt')
compileOnly project(':')
}
diff --git a/settings.gradle b/settings.gradle
index 8537e86..e0ee8f7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,8 +26,13 @@ rootProject.name = 'grails-intellij-plugin'
project(":pluginModules-$name").projectDir = file("pluginModules/$name")
}
-include 'gradle-tooling'
-include 'grails-compiler-patch'
-include 'grails-rt'
-include 'jps-plugin'
-include 'testFramework'
\ No newline at end of file
+
+['gradle-tooling', 'grails-rt', 'testFramework'].each { name ->
+ include "libs-$name"
+ project(":libs-$name").projectDir = file("libs/$name")
+}
+
+['jps-plugin', 'grails-compiler-patch'].each { name ->
+ include "libs-compiler-$name"
+ project(":libs-compiler-$name").projectDir = file("libs/compiler/$name")
+}