[BUILD] Use bundle/bundleApi as new default configs

and remove the last remains of the previous default configuration "releaseDep". Co-authored-by: Eik0fresh <[email protected]> Co-authored-by: paun42 <[email protected]> Co-authored-by: panphil <[email protected]>
saros-project · Feb 22, 2021 · b206993 · b206993
1 parent 45260e0
commit b206993
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,9 +51,6 @@ subprojects {
     configurations {
         create("testing") // used to reference the testJar
         create("testConfig") // contains test dependencies that are used by all java subprojects
-        create("releaseDep") { // contains all dependencies which has to be included into the release jar/zip
-            isTransitive = false // avoid that the whole dependency tree is released
-        }
         create("bundle") { // contains all which are used by core
             isTransitive = false // avoid that the whole dependency tree is released
         }
@@ -115,7 +112,6 @@ subprojects {
          */
         register("generateLib", Copy::class) {
             into("${project.projectDir}/lib")
-            from(projectToConf.configurations.getByName("releaseDep"))
             from(projectToConf.configurations.getByName("bundle"))
             from(projectToConf.configurations.getByName("bundleApi"))
         }

diff --git a/buildSrc/src/main/java/saros/gradle/eclipse/SarosEclipsePlugin.java b/buildSrc/src/main/java/saros/gradle/eclipse/SarosEclipsePlugin.java
@@ -18,7 +18,7 @@
 public class SarosEclipsePlugin implements Plugin<Project> {
   private static final String EXTENSION_NAME = "sarosEclipse";
   private static final String PLUGIN_VERSION_CHANGE_TASK_NAME = "changeEclipsePluginVersion";
-  private static final List<String> DEFAULT_CONFIG_NAMES = Arrays.asList("releaseDep");
+  private static final List<String> DEFAULT_CONFIG_NAMES = Arrays.asList("bundle", "bundleApi");
 
   /**
    * Method which is called when the plugin is integrated in a gradle build (e.g. with {@code apply

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -22,11 +22,6 @@ configurations {
     // Defined in root build.gradle
     val testConfig by getting {}
 
-    // populate releaseDep while it is still used by other projects
-    val releaseDep by getting {
-        extendsFrom(bundle, bundleApi)
-    }
-
     // Default configuration
     val testCompile by getting {
         extendsFrom(testConfig)
@@ -41,7 +36,6 @@ sarosEclipse {
     isCreateBundleJar = true
     isAddPdeNature = true
     pluginVersionQualifier = versionQualifier
-    configs = listOf("bundle", "bundleApi")
 }
 
 dependencies {

diff --git a/eclipse/build.gradle.kts b/eclipse/build.gradle.kts
@@ -25,7 +25,6 @@ sarosEclipse {
     isAddDependencies = true
     pluginVersionQualifier = versionQualifier
     eclipseVersion = eclipseVersionNr
-    configs = listOf("bundle", "bundleApi")
 }
 
 sourceSets {

diff --git a/stf/build.gradle.kts b/stf/build.gradle.kts
@@ -13,7 +13,6 @@ sarosEclipse {
     isAddDependencies = true
     pluginVersionQualifier = versionQualifier
     eclipseVersion = eclipseVersionNr
-    configs = listOf("bundle", "bundleApi")
 }
 
 configurations {