Skip to content

Update Byte Buddy to 1.12.6 (fixes #7) #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2022
Merged

Update Byte Buddy to 1.12.6 (fixes #7) #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
795890b
Update Byte Buddy to 1.12.6 + exclude net.bytebuddy.utility.Invoker f…
kamko Dec 21, 2021
682fa0c
Fix minification of ByteBuddy 1.12.6 by disabling optimizations
pimterry Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ configurations {
}

dependencies {
implementation group: 'net.bytebuddy', name: 'byte-buddy-dep', version: '1.11.2'
implementation group: 'net.bytebuddy', name: 'byte-buddy-dep', version: '1.12.6'
// byte buddy contains references to jna classes and without them the r8Jar step fails
compileOnly group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'

Expand Down Expand Up @@ -143,11 +143,13 @@ task distJar(type: Jar) {
// Pull raw advice classes from the shadow JAR, unminified:
from (zipTree(shadowJar.getArchiveFile())) {
include "tech/httptoolkit/javaagent/advice/**/*"
include "tech/httptoolkit/relocated/net/bytebuddy/agent/builder/**/*"
}

// Pull other source & bundled dependencies in their minified form, from R8:
from (zipTree(r8Jar.outputs.files[0])) {
exclude "tech/httptoolkit/javaagent/advice/**/*"
exclude "tech/httptoolkit/relocated/net/bytebuddy/agent/builder/**/*"
}
}

Expand Down
3 changes: 3 additions & 0 deletions r8-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
-dontobfuscate
-dontoptimize
-allowaccessmodification
-keepattributes SourceFile, LineNumberTable, *Annotation*

-keep class tech.httptoolkit.relocated.net.bytebuddy.agent.builder.** { *; }

-keep class tech.httptoolkit.javaagent.** { *; }
-keep class tech.httptoolkit.relocated.net.bytebuddy.asm.** { *; }