Skip to content

Commit f1b7793

Browse files
Fix gradle command
1 parent 0f04214 commit f1b7793

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Diff for: build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ buildscript {
1919
classpath libs.plugin.japicmp
2020
classpath libs.plugin.downloadTask
2121
classpath libs.plugin.spotless
22-
classpath libs.plugin.bnd
22+
23+
if (javaLanguageVersion.asInt() < 17) {
24+
classpath libs.plugin.bnd
25+
} else {
26+
classpath libs.plugin.bndForJava17
27+
}
2328

2429
constraints {
2530
classpath(libs.asmForPlugins) {

Diff for: gradle/libs.versions.toml

+1
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version
234234
plugin-downloadTask = { module = "de.undercouch:gradle-download-task", version = "5.6.0" }
235235
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
236236
plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
237+
plugin-bndForJava17 = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.1.0"
237238

238239
[plugins]
239240
kotlin19 = { id = "org.jetbrains.kotlin.jvm", version = "1.9.25" }

Diff for: micrometer-osgi-test/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ dependencies {
2626
def testingBundle = tasks.register('testingBundle', Bundle) {
2727
archiveClassifier = 'tests'
2828
from sourceSets.test.output
29-
sourceSet = sourceSets.test
30-
29+
if (javaLanguageVersion.asInt() < 17) {
30+
sourceSet = sourceSets.test
31+
}
3132
bundle {
3233
bnd """\
3334
Bundle-SymbolicName: \${task.archiveBaseName}-\${task.archiveClassifier}

0 commit comments

Comments
 (0)