mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-25 17:13:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix jlinkIgnore after bumping waffle-jna to 3.4.0 (#5577)

Browse source
This commit is contained in:
Chris Stewart 2024-05-09 10:01:25 -05:00 • committed by GitHub
parent 9fe67bbdbe
commit f2ae03bc52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
project/CommonSettings.scala
View file

@ -349,6 +349,53 @@ object CommonSettings {
)
}
/**
* Needed for waffle-jna "3.4.0"
* I tried just adding javax.annotation as a transitive dependency
* but couldn't get the build to work, unsure why so just ignore
* the dependencies for now as waffle-jna is only relevant on windows
* @see https://github.com/bitcoin-s/bitcoin-s/pull/5571
*
*/
private val byteBuddyJlinkIgnore = {
Vector(
"net.bytebuddy" -> "org.objectweb.asm",
"net.bytebuddy.agent.utility.nullability" -> "javax.annotation",
"net.bytebuddy.agent.utility.nullability" -> "javax.annotation.meta",
"net.bytebuddy.asm" -> "javax.annotation",
"net.bytebuddy.asm" -> "org.objectweb.asm",
"net.bytebuddy.description" -> "javax.annotation",
"net.bytebuddy.description" -> "org.objectweb.asm",
"net.bytebuddy.description.field" -> "javax.annotation",
"net.bytebuddy.description.method" -> "javax.annotation",
"net.bytebuddy.description.method" -> "org.objectweb.asm",
"net.bytebuddy.description.modifier" -> "org.objectweb.asm",
"net.bytebuddy.description.type" -> "javax.annotation",
"net.bytebuddy.description.type" -> "org.objectweb.asm",
"net.bytebuddy.dynamic" -> "javax.annotation",
"net.bytebuddy.dynamic" -> "org.objectweb.asm",
"net.bytebuddy.dynamic.scaffold" -> "javax.annotation",
"net.bytebuddy.dynamic.scaffold" -> "org.objectweb.asm",
"net.bytebuddy.dynamic.scaffold.inline" -> "javax.annotation",
"net.bytebuddy.dynamic.scaffold.inline" -> "org.objectweb.asm",
"net.bytebuddy.dynamic.scaffold.subclass" -> "org.objectweb.asm",
"net.bytebuddy.implementation" -> "javax.annotation",
"net.bytebuddy.implementation" -> "org.objectweb.asm",
"net.bytebuddy.implementation.auxiliary" -> "org.objectweb.asm",
"net.bytebuddy.implementation.bind.annotation" -> "org.objectweb.asm",
"net.bytebuddy.implementation.bytecode.assign.primitive" -> "org.objectweb.asm",
"net.bytebuddy.implementation.bytecode.collection" -> "org.objectweb.asm",
"net.bytebuddy.implementation.bytecode.member" -> "org.objectweb.asm",
"net.bytebuddy.matcher" -> "org.objectweb.asm",
"net.bytebuddy.pool" -> "javax.annotation",
"net.bytebuddy.pool" -> "org.objectweb.asm",
"net.bytebuddy.utility" -> "org.objectweb.asm",
"net.bytebuddy.utility.dispatcher" -> "org.objectweb.asm",
"net.bytebuddy.utility.nullability" -> "javax.annotation",
"net.bytebuddy.utility.nullability" -> "javax.annotation.meta"
)
}
lazy val oracleServerJlinkIgnore = {
val oracleServerIgnore = Vector(
"java.xml" -> "java.activation",
@ -361,6 +408,7 @@ object CommonSettings {
.++(loggingJlinkIgnore)
.++(dbCommonsJlinkIgnore)
.++(cryptoJlinkIgnore)
.++(byteBuddyJlinkIgnore)
JlinkIgnore.byPackagePrefix(oracleServerIgnore: _*)
}
@ -369,6 +417,7 @@ object CommonSettings {
val appServerIgnore = loggingJlinkIgnore
.++(dbCommonsJlinkIgnore)
.++(cryptoJlinkIgnore)
.++(byteBuddyJlinkIgnore)
.++(
Vector(
//https://github.com/janino-compiler/janino/blob/f6bb39d3137ad2e99b41ecc48aaaf8ab2644bd1c/janino/pom.xml#L37