Skip to content

Commit

Permalink
WIP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
stempler committed Aug 13, 2024
1 parent 994593b commit 6fd449a
Show file tree
Hide file tree
Showing 350 changed files with 672 additions and 14,825 deletions.
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/HaleProjectExtension.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class HaleProjectExtension {
boolean lazyActivation = false
String bundleName = null
String bundleSymbolicName = null
boolean singletonBundle = false
Boolean singletonBundle = null
String fragmentHost = null
String bundleVendor = null
}
24 changes: 23 additions & 1 deletion buildSrc/src/main/groovy/hale.library-conventions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ java {
}
}

dependencies {
testRuntimeOnly libs.logback.core
testRuntimeOnly libs.logback.classic
testRuntimeOnly project(':common:plugins:eu.esdihumboldt.hale.common.logback.config.test')
}

// https://github.com/bndtools/bnd/blob/master/gradle-plugins/README.md#replacing-use-of-gradles-deprecated-osgi-plugin
jar {
bundle {
Expand All @@ -33,7 +39,23 @@ jar {
symName = projectDir.name
}
def useSymName = symName
if (project.hale.singletonBundle) {

boolean singleton = false
if (project.hale.singletonBundle != null) {
// custom setting
singleton = project.hale.singletonBundle
}
else {
// determine automatically
// enable if a plugin.xml is present in the main resources

singleton = project.sourceSets.main.resources.srcDirs
.collect { resDir -> new File(resDir, 'plugin.xml')}
.findAll { it.exists()}
.any()
}

if (singleton) {
useSymName = "${useSymName};singleton:=true"
}
bnd(
Expand Down
12 changes: 0 additions & 12 deletions common/plugins/eu.esdihumboldt.hale.common.align/.classpath

This file was deleted.

39 changes: 0 additions & 39 deletions common/plugins/eu.esdihumboldt.hale.common.align/.project

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6fd449a

Please sign in to comment.