Skip to content

Commit 5b5d2c1

Browse files
committed
Fix correct usage of local bytebuddy snapshot
1 parent b9fefdd commit 5b5d2c1

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

conventions/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ spotless {
3535

3636
repositories {
3737
mavenCentral()
38+
mavenLocal()
3839
gradlePluginPortal()
3940
}
4041

@@ -64,7 +65,7 @@ dependencies {
6465
implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.2")
6566
implementation("org.spdx:spdx-gradle-plugin:0.8.0")
6667
// When updating, also update dependencyManagement/build.gradle.kts
67-
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.11")
68+
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.12-SNAPSHOT")
6869
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
6970
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
7071
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")

gradle-plugins/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ group = "io.opentelemetry.instrumentation"
1616
apply(from = "../version.gradle.kts")
1717

1818
repositories {
19+
mavenLocal()
1920
mavenCentral()
2021
gradlePluginPortal()
2122
}
@@ -25,7 +26,7 @@ configurations.named("compileOnly") {
2526
extendsFrom(bbGradlePlugin)
2627
}
2728

28-
val byteBuddyVersion = "1.15.11"
29+
val byteBuddyVersion = "1.15.12-SNAPSHOT"
2930
val aetherVersion = "1.1.0"
3031

3132
dependencies {

javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ fun CopySpec.copyByteBuddy(jar: Provider<RegularFile>) {
397397
if (path.startsWith("net/bytebuddy/") &&
398398
// this is our class that we have placed in the byte buddy package, need to preserve it
399399
!path.startsWith("net/bytebuddy/agent/builder/AgentBuilderUtil")) {
400-
exclude()
400+
//exclude() //local build seems to not include the classes under META-INF
401401
} else if (path.startsWith("META-INF/versions/9/net/bytebuddy/")) {
402402
path = path.removePrefix("META-INF/versions/9/")
403403
}

settings.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ pluginManagement {
1010
// See https://github.com/graalvm/native-build-tools/issues/626
1111
id("org.graalvm.buildtools.native") version "0.10.4"
1212
}
13+
repositories {
14+
mavenLocal()
15+
mavenCentral()
16+
gradlePluginPortal()
17+
}
1318
}
1419

1520
plugins {

0 commit comments

Comments
 (0)