Skip to content

build: JavaFX 18 -> 19-ea+11, Kotlin 1.6.0 -> 1.7.10, attach 4.0.13 -> 4.0.15, jackson 2.12.1 -> 2.13.3 #1202

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.

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 9 commits into from
Sep 2, 2022

Conversation

chengenzhao
Copy link
Contributor

@chengenzhao chengenzhao commented Aug 26, 2022

Hi:

We tried to bump the versions of dependencies and plugins
JavaFX from 18 -> 19-ea+10, it should be fine to change the final version to 19 since the JavaFX 19 is coming to the final release candidate, won't change too much
and JavaFX 19 has an important changes which is adding new .map and .flatMap method which would be really helpful for binding style programming

Kotlin from 1.6.0 -> 1.7.10
We have to remove the modular classifier of dependency of Kotlin-stdlib
since the incremental compilation is not experimental any more
and also another significant change in the code is that
@Suppress("NON_EXHAUSTIVE_WHEN") is not available since 1.7
non exhaustive when statement will cause compilation error
so use else clause to complete the when statement

and also bump the plugins' versions

The bumped version tests have passed in my computer
截屏2022-08-27 上午3 51 51

Cheers

@codecov-commenter
Copy link

codecov-commenter commented Aug 26, 2022

Codecov Report

Merging #1202 (fea3cf0) into dev (b31be41) will increase coverage by 0.05%.
The diff coverage is 66.66%.

@@             Coverage Diff              @@
##                dev    #1202      +/-   ##
============================================
+ Coverage     58.60%   58.66%   +0.05%     
+ Complexity     2967     2960       -7     
============================================
  Files           303      303              
  Lines         14989    14993       +4     
  Branches       1536     1517      -19     
============================================
+ Hits           8785     8796      +11     
- Misses         5689     5692       +3     
+ Partials        515      505      -10     
Impacted Files Coverage Δ
...xgl/src/main/kotlin/com/almasb/fxgl/dev/Console.kt 0.00% <0.00%> (ø)
.../src/main/kotlin/com/almasb/fxgl/input/Triggers.kt 96.61% <80.00%> (+0.05%) ⬆️
.../kotlin/com/almasb/fxgl/animation/Interpolators.kt 100.00% <0.00%> (ø)
...xgl/dsl/components/view/GenericBarViewComponent.kt 0.00% <0.00%> (ø)
...masb/fxgl/dsl/components/RechargeableComponents.kt 46.51% <0.00%> (+0.17%) ⬆️
...otlin/com/almasb/fxgl/app/scene/FXGLDefaultMenu.kt 35.89% <0.00%> (+0.23%) ⬆️
...xgl/cutscene/dialogue/SerializableDialogueGraph.kt 90.90% <0.00%> (+1.01%) ⬆️
...almasb/fxgl/app/services/FXGLAssetLoaderService.kt 89.28% <0.00%> (+1.02%) ⬆️
fxgl/src/main/kotlin/com/almasb/fxgl/app/Engine.kt 81.69% <0.00%> (+1.40%) ⬆️
...lin/com/almasb/fxgl/core/collection/PropertyMap.kt 97.87% <0.00%> (+2.12%) ⬆️
... and 2 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

so add else clause and return the compare result of modifier == NONE
and also lift return to the place before when.
so add else clause and return false result
and also lift return to the place before when.
is not available since 1.7
so use else clause to replace it
Copy link
Owner

@AlmasB AlmasB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, please can you have a look at the comments. Meanwhile, I'll check the logic behind isReleased() and get back.

and also delete classifier of kotlin dependency
@chengenzhao
Copy link
Contributor Author

Thanks for this, please can you have a look at the comments. Meanwhile, I'll check the logic behind isReleased() and get back.

Sure, un necessary bumped plugins and test dependencies are reverted

@AlmasB AlmasB changed the title Bump plugin and dependencies versions build: Bump plugin and dependencies versions Aug 30, 2022
@AlmasB
Copy link
Owner

AlmasB commented Aug 30, 2022

Looks good, ready for merge once isReleased() is updated.

@AlmasB AlmasB changed the title build: Bump plugin and dependencies versions build: JavaFX 18 -> 19-ea+10, Kotlin 1.6.0 -> 1.7.10, attach 4.0.13 -> 4.0.15, jackson 2.12.1 -> 2.13.3 Aug 30, 2022
because 0.8.7 doesn't support class file version 62 which is JDK 18
I tried to use jacoco 0.8.7 it throws out some warning exceptions telling me:Unsupported class file major version 62

So I think it would be better to upgrade jacoco plugin also
@chengenzhao
Copy link
Contributor Author

Looks good, ready for merge once isReleased() is updated.

isReleased() is updated

but we got another problem which may be caused by jacoco plugin version 0.8.7
seems like jacoco 0.8.7 doesn't support class file format class file major version 62 which is Java 18 class file
It may cause the test of fxgl-io failed if maven uses JDK 18 to build the FXGL projects
So should we upgrade jacoco plugin version also?
Bumping the jacoco plugin version to 0.8.8 and the CI/CD passed all tests

Cheers

@chengenzhao chengenzhao changed the title build: JavaFX 18 -> 19-ea+10, Kotlin 1.6.0 -> 1.7.10, attach 4.0.13 -> 4.0.15, jackson 2.12.1 -> 2.13.3 build: JavaFX 18 -> 19-ea+11, Kotlin 1.6.0 -> 1.7.10, attach 4.0.13 -> 4.0.15, jackson 2.12.1 -> 2.13.3 Sep 2, 2022
Copy link
Owner

@AlmasB AlmasB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, many thanks

@AlmasB AlmasB merged commit c9851eb into AlmasB:dev Sep 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants