Migrate remaining code from plugins -> plugin-development

gradle · May 6, 2024 · fd5b435 · fd5b435
1 parent 7b74a03
commit fd5b435
Show file tree

Hide file tree

Showing 23 changed files with 1 addition and 57 deletions.
diff --git a/.teamcity/subprojects.json b/.teamcity/subprojects.json
@@ -748,13 +748,6 @@
     "functionalTests": true,
     "crossVersionTests": false
   },
-  {
-    "name": "plugins",
-    "path": "subprojects/plugins",
-    "unitTests": false,
-    "functionalTests": true,
-    "crossVersionTests": false
-  },
   {
     "name": "plugins-application",
     "path": "platforms/jvm/plugins-application",

diff --git a/platforms/extensibility/plugin-development/build.gradle.kts b/platforms/extensibility/plugin-development/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
     implementation(project(":testing-base"))
     implementation(project(":testing-jvm"))
     implementation(project(":test-suites-base"))
-    implementation(project(":plugins"))
     implementation(project(":plugins-groovy"))
     implementation(project(":plugins-java"))
     implementation(project(":plugins-java-base"))

diff --git a/...gins/BuildSrcPluginIntegrationTest.groovy → ...gins/BuildSrcPluginIntegrationTest.groovy b/...gins/BuildSrcPluginIntegrationTest.groovy → ...gins/BuildSrcPluginIntegrationTest.groovy
diff --git a/...allelCompilerDaemonIntegrationTest.groovy → ...allelCompilerDaemonIntegrationTest.groovy b/...allelCompilerDaemonIntegrationTest.groovy → ...allelCompilerDaemonIntegrationTest.groovy
diff --git a/...va/ParallelTestTaskIntegrationTest.groovy → ...va/ParallelTestTaskIntegrationTest.groovy b/...va/ParallelTestTaskIntegrationTest.groovy → ...va/ParallelTestTaskIntegrationTest.groovy
diff --git a/...IntegrationTest/shared/GroovyClass.groovy → ...IntegrationTest/shared/GroovyClass.groovy b/...IntegrationTest/shared/GroovyClass.groovy → ...IntegrationTest/shared/GroovyClass.groovy
@@ -1,3 +1,4 @@
+package org.gradle.compile.daemon.ParallelCompilerDaemonIntegrationTest.shared
 /**
  * An immutable classpath.
  */

diff --git a/...emonIntegrationTest/shared/JavaClass.java → ...emonIntegrationTest/shared/JavaClass.java b/...emonIntegrationTest/shared/JavaClass.java → ...emonIntegrationTest/shared/JavaClass.java
diff --git a/...DaemonIntegrationTest/shared/build.gradle → ...DaemonIntegrationTest/shared/build.gradle b/...DaemonIntegrationTest/shared/build.gradle → ...DaemonIntegrationTest/shared/build.gradle
@@ -11,4 +11,3 @@ subprojects {
     def count = (project.name - "project") as int
     compileJava.options.forkOptions.jvmArgs = count % 2 ? ["-dsa"] : ["-esa"]
 }
-
diff --git a/...iVersionAttributeConfigurationAction.java → ...iVersionAttributeConfigurationAction.java b/...iVersionAttributeConfigurationAction.java → ...iVersionAttributeConfigurationAction.java
diff --git a/...vyBuildSrcProjectConfigurationAction.java → ...vyBuildSrcProjectConfigurationAction.java b/...vyBuildSrcProjectConfigurationAction.java → ...vyBuildSrcProjectConfigurationAction.java
diff --git a/...ildsrc.BuildSrcProjectConfigurationAction → ...ildsrc.BuildSrcProjectConfigurationAction b/...ildsrc.BuildSrcProjectConfigurationAction → ...ildsrc.BuildSrcProjectConfigurationAction
diff --git a/platforms/ide/ide-plugins/build.gradle.kts b/platforms/ide/ide-plugins/build.gradle.kts
@@ -58,7 +58,6 @@ dependencies {
     implementation(libs.commonsLang)
 
     runtimeOnly(project(":language-jvm"))
-    runtimeOnly(project(":plugins"))
     runtimeOnly(project(":testing-base"))
 
     testImplementation(testFixtures(project(":core")))

diff --git a/platforms/ide/ide/build.gradle.kts b/platforms/ide/ide/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":base-services-groovy"))
     implementation(project(":dependency-management"))
-    implementation(project(":plugins"))
     implementation(project(":plugins-java"))
     implementation(project(":plugins-java-base"))
     implementation(project(":platform-base"))

diff --git a/platforms/jvm/ear/build.gradle.kts b/platforms/jvm/ear/build.gradle.kts
@@ -37,8 +37,6 @@ dependencies {
     implementation(libs.guava)
     implementation(libs.commonsLang)
 
-    runtimeOnly(project(":plugins"))
-
     testImplementation(project(":base-services-groovy"))
     testImplementation(testFixtures(project(":core")))
     testImplementation(project(":native"))

diff --git a/platforms/jvm/java-platform/build.gradle.kts b/platforms/jvm/java-platform/build.gradle.kts
@@ -48,9 +48,6 @@ dependencies {
     testImplementation(project(":language-java")) {
         because("need to access JavaCompile task")
     }
-    testImplementation(project(":plugins")) {
-        because("need to access JavaPluginExtension")
-    }
 
     testImplementation(testFixtures(project(":core")))
 

diff --git a/platforms/jvm/testing-jvm/build.gradle.kts b/platforms/jvm/testing-jvm/build.gradle.kts
@@ -55,7 +55,6 @@ dependencies {
     testImplementation(testFixtures(project(":core")))
     testImplementation(testFixtures(project(":model-core")))
 
-    integTestImplementation(project(":plugins"))
     integTestImplementation(testFixtures(project(":testing-base")))
     integTestImplementation(testFixtures(project(":language-groovy")))
 

diff --git a/platforms/jvm/war/build.gradle.kts b/platforms/jvm/war/build.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
     implementation(project(":plugins-java"))
     implementation(project(":plugins-jvm-test-suite"))
 
-    runtimeOnly(project(":plugins"))
     runtimeOnly(project(":testing-base"))
 
 

diff --git a/platforms/native/language-native/build.gradle.kts b/platforms/native/language-native/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
     implementation(project(":dependency-management"))
     implementation(project(":platform-base"))
     implementation(project(":platform-native"))
-    implementation(project(":plugins"))
     implementation(project(":publish"))
     implementation(project(":maven"))
     implementation(project(":ivy"))

diff --git a/platforms/software/antlr/build.gradle.kts b/platforms/software/antlr/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
     }
 
     runtimeOnly(project(":language-jvm"))
-    runtimeOnly(project(":plugins"))
     runtimeOnly(project(":workers"))
 
     testImplementation(project(":base-services-groovy"))

diff --git a/platforms/software/build-init/build.gradle.kts b/platforms/software/build-init/build.gradle.kts
@@ -90,7 +90,6 @@ dependencies {
     testFixturesImplementation(project(":platform-base"))
     testFixturesImplementation(project(":core-api"))
     testFixturesImplementation(project(":logging"))
-    testFixturesImplementation(project(":plugins"))
     testFixturesImplementation(project(":plugins-java"))
     testFixturesImplementation(project(":testing-base"))
     testFixturesImplementation(project(":test-suites-base"))

diff --git a/subprojects/core/build.gradle.kts b/subprojects/core/build.gradle.kts
@@ -260,7 +260,6 @@ dependencies {
     integTestImplementation(project(":workers"))
     integTestImplementation(project(":dependency-management"))
     integTestImplementation(project(":launcher"))
-    integTestImplementation(project(":plugins"))
     integTestImplementation(project(":war"))
     integTestImplementation(libs.jansi)
     integTestImplementation(libs.jetbrainsAnnotations)
@@ -304,4 +303,3 @@ tasks.compileTestGroovy {
 
 integTest.usesJavadocCodeSnippets = true
 testFilesCleanup.reportOnly = true
-
diff --git a/subprojects/plugins/build.gradle.kts b/subprojects/plugins/build.gradle.kts
diff --git a/testing/integ-test/build.gradle.kts b/testing/integ-test/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
 
     crossVersionTestImplementation(project(":base-services"))
     crossVersionTestImplementation(project(":core"))
-    crossVersionTestImplementation(project(":plugins"))
     crossVersionTestImplementation(project(":plugins-application"))
     crossVersionTestImplementation(project(":platform-jvm"))
     crossVersionTestImplementation(project(":language-jvm"))