sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 13:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix test build error

Browse source
This commit is contained in:
Craig Raw 2022-05-11 13:23:44 +02:00
parent 69d0a2f96e
commit 361e92c600
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -130,7 +130,7 @@ processResources {
} }
test { test {
jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED' jvmArgs '--add-opens=java.base/java.io=com.google.gson'
} }
run { run {
@ -459,6 +459,8 @@ extraJavaModuleInfo {
module('kotlin-stdlib-jdk7-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk7', '1.5.20') module('kotlin-stdlib-jdk7-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk7', '1.5.20')
module('kotlin-stdlib-1.5.20.jar', 'kotlin.stdlib', '1.5.20') { module('kotlin-stdlib-1.5.20.jar', 'kotlin.stdlib', '1.5.20') {
exports('kotlin') exports('kotlin')
exports('kotlin.jvm')
exports('kotlin.collections')
} }
module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') { module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
exports('com.sparrowwallet.hummingbird') exports('com.sparrowwallet.hummingbird')
@ -584,15 +586,12 @@ extraJavaModuleInfo {
module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') { module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
requires('java.xml') requires('java.xml')
} }
module('kotlin-stdlib-common-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.common', '1.5.20') {
exports('kotlin.jvm')
exports('kotlin.collections')
}
module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') { module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
exports('com.beust.jcommander') exports('com.beust.jcommander')
} }
module('junit-4.12.jar', 'junit', '4.12') { module('junit-4.12.jar', 'junit', '4.12') {
exports('org.junit') exports('org.junit')
requires('org.hamcrest.core')
} }
module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3') module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
} }

2
buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
View file

@ -67,6 +67,8 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
outputs.file(originalJar); outputs.file(originalJar);
} else if (automaticModules.containsKey(originalJarName)) { } else if (automaticModules.containsKey(originalJarName)) {
addAutomaticModuleName(originalJar, getModuleJar(outputs, originalJar), automaticModules.get(originalJarName)); addAutomaticModuleName(originalJar, getModuleJar(outputs, originalJar), automaticModules.get(originalJarName));
} else if(originalJarName.startsWith("kotlin-stdlib-common")) {
//ignore
} else { } else {
throw new RuntimeException("Not a module and no mapping defined: " + originalJarName); throw new RuntimeException("Not a module and no mapping defined: " + originalJarName);
} }

6
src/test/resources/com/sparrowwallet/sparrow/io/cc-multisig-export-multideriv.txt
View file

@ -3,12 +3,12 @@ Name: el-CC-3-of-3-sb-2
Policy: 3 of 3 Policy: 3 of 3
Format: P2WSH Format: P2WSH
# derivation: m/48'/0'/0'/2' Derivation: m/48'/0'/0'/2'
06B57041: xpub6EfEGa5isJbQFSswM5Uptw5BSq2Td1ZDJr3QUNUcMySpC7itZ3ccypVHtLPnvMzKQ2qxrAgH49vhVxRcaQLFbixAVRR8RACrYTp88Uv9h8Z 06B57041: xpub6EfEGa5isJbQFSswM5Uptw5BSq2Td1ZDJr3QUNUcMySpC7itZ3ccypVHtLPnvMzKQ2qxrAgH49vhVxRcaQLFbixAVRR8RACrYTp88Uv9h8Z
# derivation: m/48'/0'/0'/2' Derivation: m/48'/0'/0'/2'
4B569672: xpub6FFEQVG6QR28giDuML74Y7EMPwqEiKftNjScLzg5WKM41bf6LMP2XspjBgNp28tvkNUZdokmTY4TcRbuGZBSMvNoUECrKW1y3TBPeQJVmAg 4B569672: xpub6FFEQVG6QR28giDuML74Y7EMPwqEiKftNjScLzg5WKM41bf6LMP2XspjBgNp28tvkNUZdokmTY4TcRbuGZBSMvNoUECrKW1y3TBPeQJVmAg
# derivation: m/47'/0'/0'/1' Derivation: m/47'/0'/0'/1'
CA9A2B19: xpub6Eb6Z1xtmWRiWKgRpHf6dHiEagGd6FLiBXrnma1nFK4PGRYqSVqVyJaxna5Mb8etSP4ATKVAvKnXG1a9HZauoAawuSDJT5RgH2HqEVHZVHY CA9A2B19: xpub6Eb6Z1xtmWRiWKgRpHf6dHiEagGd6FLiBXrnma1nFK4PGRYqSVqVyJaxna5Mb8etSP4ATKVAvKnXG1a9HZauoAawuSDJT5RgH2HqEVHZVHY