Fix Gradle config for Eclipse IDE (#2961)

* Fix Gradle config for Eclipse IDE * Apply eclipse plugin
GoogleContainerTools · Jan 5, 2021 · 7517170 · 7517170
1 parent ad96231
commit 7517170
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 0 deletions.
diff --git a/build.gradle b/build.gradle
@@ -212,6 +212,7 @@ subprojects {
 
   configurations {
     integrationTestImplementation.extendsFrom testImplementation
+    integrationTestImplementation.setCanBeResolved(true)
     integrationTestRuntime.extendsFrom testRuntime
   }
 

diff --git a/jib-build-plan/build.gradle b/jib-build-plan/build.gradle
@@ -52,3 +52,7 @@ release {
   }
 }
 /* RELEASE */
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */
diff --git a/jib-cli/build.gradle b/jib-cli/build.gradle
@@ -46,3 +46,14 @@ release {
     requireBranch = /^cli-release-v\d+.*$/  //regex
   }
 }
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+eclipse.classpath.file.whenMerged {
+  entries.each {
+    if (it.path == 'src/integration-test/resources') {
+      it.excludes += 'jarTest/'
+    }
+  }
+}
+/* ECLIPSE */
diff --git a/jib-core/build.gradle b/jib-core/build.gradle
@@ -62,3 +62,7 @@ release {
   }
 }
 /* RELEASE */
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */
diff --git a/jib-gradle-plugin-extension-api/build.gradle b/jib-gradle-plugin-extension-api/build.gradle
@@ -1,6 +1,7 @@
 plugins {
   id 'net.researchgate.release'
   id 'maven-publish'
+  id 'eclipse'
 }
 
 dependencies {
@@ -47,3 +48,7 @@ release {
   }
 }
 /* RELEASE */
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */
diff --git a/jib-gradle-plugin/build.gradle b/jib-gradle-plugin/build.gradle
@@ -86,6 +86,7 @@ tasks.publishPlugins.dependsOn integrationTest
 /* RELEASE */
 
 /* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
 eclipse.classpath.file.whenMerged {
   entries.each {
     if (it.path == 'src/test/resources' || it.path == 'src/integration-test/resources') {

diff --git a/jib-maven-plugin-extension-api/build.gradle b/jib-maven-plugin-extension-api/build.gradle
@@ -1,6 +1,7 @@
 plugins {
   id 'net.researchgate.release'
   id 'maven-publish'
+  id 'eclipse'
 }
 
 dependencies {
@@ -47,3 +48,7 @@ release {
   }
 }
 /* RELEASE */
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */
diff --git a/jib-maven-plugin/build.gradle b/jib-maven-plugin/build.gradle
@@ -75,6 +75,7 @@ release {
 /* RELEASE */
 
 /* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
 eclipse.classpath.file.whenMerged {
   entries.each {
     if (it.path == 'src/test/resources') {

diff --git a/jib-plugins-common/build.gradle b/jib-plugins-common/build.gradle
@@ -21,3 +21,7 @@ dependencies {
 }
 
 sourceSets.test.resources.srcDirs project(':jib-core').sourceSets.test.resources
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */
diff --git a/jib-plugins-extension-common/build.gradle b/jib-plugins-extension-common/build.gradle
@@ -1,6 +1,7 @@
 plugins {
   id 'net.researchgate.release'
   id 'maven-publish'
+  id 'eclipse'
 }
 
 jar {
@@ -41,3 +42,7 @@ release {
   }
 }
 /* RELEASE */
+
+/* ECLIPSE */
+eclipse.classpath.plusConfigurations += [configurations.integrationTestImplementation]
+/* ECLIPSE */