Skip to content
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

Fix/graal updates #140

Closed
wants to merge 3 commits into from
Closed

Fix/graal updates #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c77dfe9
update reflection mapping and picoCLI so reflection config works again
Mar 18, 2020
5121af3
fix native image, add resource mapping, update reflection mapping gen…
Mar 18, 2020
0353ac4
revert changes to ShellCommand
Mar 20, 2020
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
13 changes: 7 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ ext {

// Dependency versions

picoclishell3Version = '4.0.4'
picocliVersion = '4.0.4'
jline3Version = '3.12.1'
jline3JansiVersion = '3.12.1'
picoclishell3Version = '4.2.0'
picocliVersion = '4.2.0'
jline3Version = '3.14.0'
jline3JansiVersion = '3.14.0'
daggerVersion = '2.21'
guavaVersion ='27.0.1-jre'
hivemqclientVersion = '1.1.3'
Expand All @@ -127,7 +127,7 @@ ext {
bouncycastleVersion='1.62'
nettyVersion = '4.1.37.Final'
gsonVersion = '2.8.6'
substrateVmVersion = '19.2.0'
substrateVmVersion = '19.2.1'
junitJupiterVersion = '5.5.1'
}

Expand Down Expand Up @@ -282,11 +282,12 @@ test {
***************/

graal {
graalVersion '19.2.0'
graalVersion '19.2.1'
outputName "${rootProject.name}"
mainClass application.mainClassName
option '-H:+PrintClassInitialization'
option '-H:ReflectionConfigurationFiles=tools/reflection.json'
option "-H:ResourceConfigurationFiles=tools/resources.json"
option '-H:-UseServiceLoaderFeature'
option '-H:IncludeResources="org/jline/utils/*.*'
option '-H:IncludeResources="org/jline/terminal/*.*'
Expand Down
11 changes: 9 additions & 2 deletions tools/createReflectionJson.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ com.hivemq.cli.commands.shell.ShellExitCommand \
com.hivemq.cli.commands.cli.PublishCommand \
com.hivemq.cli.commands.cli.SubscribeCommand \
com.hivemq.cli.commands.MqttCLICommand \
> reflection.json
> reflection_pico.json

## the methods from the abstract classes in the PublishCommand and SubscribeCommand must be removed!

# Add additional mappings (currently, only HelpCommand for shell mode)
# jq filter from https://stackoverflow.com/questions/42011086/merge-arrays-of-json requires jq >= 1.5
# the methods from the abstract classes in the PublishCommand and SubscribeCommand must be removed,
# the second query in the pipeline does just that (remove methods array for classes that contain the activateDebugMethod method mapping, which is invalid)
jq -s '.[0]=([.[]]|flatten)|.[0]' reflection_pico.json reflection_additional.json \
| jq 'del(.[].methods | select(. != null) | select(.[].name == "activateDebugMode"))' \
> reflection.json
Loading