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.

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

[build] Follow-up to #2088 bump to Gradle 6.3 : 3.3 specifics #2089

Merged
merged 2 commits into from
Mar 31, 2020

Conversation

simonbasle
Copy link
Member

@simonbasle simonbasle commented Mar 30, 2020

  • build-scan plugin (added in 3.3) has been upgraded but must now be
    applied in settings.gradle
  • unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
    Gradle 6.3 compatibility
  • Bump of blockhound to 1.0.3 to avoid reactor.shaded version of
    bytebuddy (which confuses BND)
  • Exclude blockhound in core's BDN Export-Package

@simonbasle simonbasle added the type/chores A task not related to code (build, formatting, process, ...) label Mar 30, 2020
@simonbasle simonbasle added this to the 3.3.5.RELEASE milestone Mar 30, 2020
@simonbasle simonbasle requested review from aneveu and bsideup March 30, 2020 16:19
@@ -22,7 +22,7 @@ apply plugin: 'kotlin'

ext {
bndOptions = [
"Export-Package": "!*internal*,reactor.*;-noimport:=true",
"Export-Package": "!*internal*,reactor.adapter.*,reactor.core.*,reactor.util.*;-noimport:=true",
Copy link
Contributor

Choose a reason for hiding this comment

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

I am surprised that we need to duplicate it here o_O OSGI is the gift that keeps on giving 😂

Copy link
Member Author

Choose a reason for hiding this comment

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

it otherwise complains about reactor.shaded which IIRC is linked to the wonky stubs stuff we did for StackWalker-and-al

Copy link
Contributor

Choose a reason for hiding this comment

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

  1. it only applies to reactor-tools, right?
  2. what if we explicitly exclude reactor.shaded.*?

Copy link
Contributor

Choose a reason for hiding this comment

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

re StackWalker - not the case, but reactor-tools' shading of ByteBuddy

@simonbasle
Copy link
Member Author

In core's build, with

"Export-Package": "!*internal*,!*blockhound*,reactor.*",

We get

error  : Classes found in the wrong directory: {reactor/shaded/META-INF/versions/9/module-info.class=module-info}

Which we can suppress at bnd level with the instruction:

	"-fixupmessages": '"Classes found in the wrong directory";is:=warning',

But then it is japicmp that complains:

Execution failed for task ':reactor-core:japicmp'.
> A failure occurred while executing Comparing [reactor-core-3.3.5.BUILD-SNAPSHOT.jar] with [reactor-core-3.3.0.RELEASE.jar]
   > Failed to load file from jar 'reactor/shaded/META-INF/versions/9/module-info.class' as class file: invalid constant type: 19 at 4.

UPDATE: This appears to be due to blockhound v1.0.0 having a reactor.shaded version of bytebuddy. v1.0.3 removes the reactor prefix so the above configuration works and doesn't pick up the shaded classes.

@simonbasle simonbasle force-pushed the buildGradle6InMaster branch from afd0a65 to 2515ce1 Compare March 31, 2020 11:11
 - build-scan plugin (added in 3.3) has been upgraded but must now be
 applied in settings.gradle
 - unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
 Gradle 6.3 compatibility
 - Bump of blockhound to 1.0.3 to avoid `reactor.shaded` version of
 bytebuddy (which confuses BND)
 - Exclude blockhound in core's BDN Export-Package
@simonbasle simonbasle force-pushed the buildGradle6InMaster branch from 9fa66a7 to 11992a5 Compare March 31, 2020 15:02
@codecov-io
Copy link

Codecov Report

Merging #2089 into master will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2089      +/-   ##
============================================
+ Coverage     81.97%   81.99%   +0.02%     
- Complexity     4087     4089       +2     
============================================
  Files           380      380              
  Lines         31277    31273       -4     
  Branches       5798     5798              
============================================
+ Hits          25638    25641       +3     
+ Misses         4068     4062       -6     
+ Partials       1571     1570       -1     
Impacted Files Coverage Δ Complexity Δ
...re/src/main/java/reactor/core/publisher/Hooks.java 93.10% <100.00%> (ø) 44.00 <1.00> (+1.00)
...va/reactor/core/publisher/ParallelMergeReduce.java 71.31% <0.00%> (-1.64%) 3.00% <0.00%> (ø%)
...rc/main/java/reactor/core/publisher/FluxRange.java 88.07% <0.00%> (-1.33%) 6.00% <0.00%> (ø%)
...eactor/core/publisher/ParallelMergeSequential.java 84.97% <0.00%> (-0.52%) 7.00% <0.00%> (ø%)
...ain/java/reactor/core/publisher/FluxPublishOn.java 86.77% <0.00%> (-0.21%) 6.00% <0.00%> (ø%)
...rc/main/java/reactor/core/publisher/Operators.java 81.44% <0.00%> (+0.13%) 136.00% <0.00%> (+1.00%)
...c/main/java/reactor/core/publisher/FluxReplay.java 85.09% <0.00%> (+0.14%) 29.00% <0.00%> (ø%)
...ain/java/reactor/core/publisher/FluxConcatMap.java 90.83% <0.00%> (+0.27%) 7.00% <0.00%> (ø%)
...main/java/reactor/core/publisher/FluxIterable.java 78.12% <0.00%> (+0.69%) 13.00% <0.00%> (ø%)
...c/main/java/reactor/core/publisher/MonoCreate.java 74.24% <0.00%> (+0.75%) 3.00% <0.00%> (ø%)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1b85926...11992a5. Read the comment docs.

@simonbasle simonbasle changed the title [build] Follow-up to #2088 : 3.3 specifics of bump to Gradle 6.3 [build] Follow-up to #2088 bump to Gradle 6.3 : 3.3 specifics Mar 31, 2020
@simonbasle simonbasle merged commit aa58404 into master Mar 31, 2020
@simonbasle simonbasle deleted the buildGradle6InMaster branch March 31, 2020 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/chores A task not related to code (build, formatting, process, ...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants