Skip to content

Commit

Permalink
[BUILD] Use bundle/bundleApi as new default configs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
4 people committed Feb 19, 2021
1 parent 59ad413 commit fd07483
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 deletions.
4 changes: 0 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -41,7 +36,6 @@ sarosEclipse {
isCreateBundleJar = true
isAddPdeNature = true
pluginVersionQualifier = versionQualifier
configs = listOf("bundle", "bundleApi")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion eclipse/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ sarosEclipse {
isAddDependencies = true
pluginVersionQualifier = versionQualifier
eclipseVersion = eclipseVersionNr
configs = listOf("bundle", "bundleApi")
}

sourceSets {
Expand Down

0 comments on commit fd07483

Please sign in to comment.