Skip to content

Commit 8a1167a

Browse files
FKHalsEik0freshpaun42panphil
committed
[BUILD] Use bundle/bundleApi as new default configs
and remove the last remains of the previous default configuration "releaseDep". Co-authored-by: Eik0fresh <39055879+Eik0fresh@users.noreply.github.com> Co-authored-by: paun42 <75132590+paun42@users.noreply.github.com> Co-authored-by: panphil <74254708+panphil@users.noreply.github.com>
1 parent 59ad413 commit 8a1167a

5 files changed

Lines changed: 1 addition & 13 deletions

File tree

build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ subprojects {
5151
configurations {
5252
create("testing") // used to reference the testJar
5353
create("testConfig") // contains test dependencies that are used by all java subprojects
54-
create("releaseDep") { // contains all dependencies which has to be included into the release jar/zip
55-
isTransitive = false // avoid that the whole dependency tree is released
56-
}
5754
create("bundle") { // contains all which are used by core
5855
isTransitive = false // avoid that the whole dependency tree is released
5956
}
@@ -115,7 +112,6 @@ subprojects {
115112
*/
116113
register("generateLib", Copy::class) {
117114
into("${project.projectDir}/lib")
118-
from(projectToConf.configurations.getByName("releaseDep"))
119115
from(projectToConf.configurations.getByName("bundle"))
120116
from(projectToConf.configurations.getByName("bundleApi"))
121117
}

buildSrc/src/main/java/saros/gradle/eclipse/SarosEclipsePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class SarosEclipsePlugin implements Plugin<Project> {
1919
private static final String EXTENSION_NAME = "sarosEclipse";
2020
private static final String PLUGIN_VERSION_CHANGE_TASK_NAME = "changeEclipsePluginVersion";
21-
private static final List<String> DEFAULT_CONFIG_NAMES = Arrays.asList("releaseDep");
21+
private static final List<String> DEFAULT_CONFIG_NAMES = Arrays.asList("bundle", "bundleApi");
2222

2323
/**
2424
* Method which is called when the plugin is integrated in a gradle build (e.g. with {@code apply

core/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ configurations {
2222
// Defined in root build.gradle
2323
val testConfig by getting {}
2424

25-
// populate releaseDep while it is still used by other projects
26-
val releaseDep by getting {
27-
extendsFrom(bundle, bundleApi)
28-
}
29-
3025
// Default configuration
3126
val testCompile by getting {
3227
extendsFrom(testConfig)
@@ -41,7 +36,6 @@ sarosEclipse {
4136
isCreateBundleJar = true
4237
isAddPdeNature = true
4338
pluginVersionQualifier = versionQualifier
44-
configs = listOf("bundle", "bundleApi")
4539
}
4640

4741
dependencies {

eclipse/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ sarosEclipse {
2525
isAddDependencies = true
2626
pluginVersionQualifier = versionQualifier
2727
eclipseVersion = eclipseVersionNr
28-
configs = listOf("bundle", "bundleApi")
2928
}
3029

3130
sourceSets {

stf/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ sarosEclipse {
1313
isAddDependencies = true
1414
pluginVersionQualifier = versionQualifier
1515
eclipseVersion = eclipseVersionNr
16-
configs = listOf("bundle", "bundleApi")
1716
}
1817

1918
configurations {

0 commit comments

Comments
 (0)