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: consistent naming of Gradle configuration files / Gradle updates #12997

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

jjohannes
Copy link
Collaborator

@jjohannes jjohannes commented Apr 25, 2024

Description:

Consistent names and locations for shared Gradle configuration (aka convention plugins). Changes:

  • moved build-source to graldle/plugins and merged to just one "plugins" project. This is what most projects do now. And I like that it keeps things you do not need to touch regularly hidden in the "gradle" folder (that we already have for the wrapper).
  • Changes to convention plugin IDs:
    • All now have the com.hedera.gradle namespace to indicate that these are "packages" for the "gradle build configurations" (and not production or test code). The idea is that the configuration (with the same naming) can be reused in other repos like pbj or hedera-sdk-java.
    • The "main" convention plugins that define to which group a project belonga are now consistently named. We have:
      • com.hedera.gradle.platform
      • com.hedera.gradle.services
      • com.hedera.gradle.blocknode
  • The -convention suffix has been removed from all places where it was used. It was inconsistently used and does not add any value imo.
  • Gradle and all plugins are now updated to the latest version
  • The patching in com.hedera.gradle.jpms-modules is now expressed in a more compact way using the new features for this of the org.gradlex.jvm-dependency-conflict-resolution plugin.

Related issue(s):

#11568

Notes for reviewer:

Checklist

  • Documented (Code comments, README, etc.)
  • Tested (unit, integration, etc.)

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Restart) Results

2 tests   2 ✅  7m 59s ⏱️
2 suites  0 💤
2 files    0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Node Death Reconnect) Results

2 tests   2 ✅  8m 47s ⏱️
2 suites  0 💤
2 files    0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Token) Results

237 tests   235 ✅  22m 41s ⏱️
 17 suites    2 💤
 17 files      0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Crypto) Results

335 tests   335 ✅  40m 26s ⏱️
 25 suites    0 💤
 25 files      0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Misc) Results

468 tests   458 ✅  41m 13s ⏱️
 77 suites   10 💤
 77 files      0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Time Consuming) Results

21 tests   21 ✅  53m 45s ⏱️
 3 suites   0 💤
 3 files     0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: Unit Test Results

  2 308 files  ±0    2 308 suites  ±0   2h 35m 28s ⏱️ + 34m 32s
118 978 tests ±0  118 911 ✅ ±0  67 💤 ±0  0 ❌ ±0 
127 539 runs  ±0  127 472 ✅ ±0  67 💤 ±0  0 ❌ ±0 

Results for commit dd76e88. ± Comparison against base commit 0e8eca1.

This pull request removes 4009 and adds 3772 tests. Note that renamed tests count towards both.

  
             IssuerDN: CN=s-aaaa
            SubjectDN: CN=s-aaaa
           Final Date: Fri Jan 01 00:00:00 UTC 2100
           Public Key: RSA Public Key [2e:28:bc:1e:d3:83:25:92:8e:cb:98:b1:b6:84:06:9c:d5:d8:14:d5],[56:66:d1:a4]
           Start Date: Sat Jan 01 00:00:00 UTC 2000
         SerialNumber: 12482092706667292405
        modulus: c1a0ff5d2372b53d12d12bb87dd03f5e…
        modulus: c1a0ff5d2372b53d12d12bb87dd03f5…
…
com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [4] 

com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [6] 

com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [7]   
  
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [10] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@9cb6d8cb
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [11] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@b24d5336
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [12] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@9f46ba25
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [13] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@f4d41689
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [14] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@86a312a7
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [15] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@8d44f095
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [16] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@9ae5b33
…

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Smart Contract) Results

604 tests   604 ✅  1h 13m 41s ⏱️
 63 suites    0 💤
 63 files      0 ❌

Results for commit dd76e88.

♻️ This comment has been updated with latest results.

@jjohannes jjohannes force-pushed the 11568-update-gradle branch 5 times, most recently from a1f3c08 to a0941f3 Compare April 30, 2024 06:59
jjohannes added a commit that referenced this pull request Apr 30, 2024
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
@jjohannes jjohannes self-assigned this Apr 30, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Apr 30, 2024
hashgraph/hedera-services#12997
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Apr 30, 2024
hashgraph/hedera-services#12997
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Apr 30, 2024
hashgraph/hedera-services#12997
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
JeffreyDallas
JeffreyDallas previously approved these changes May 6, 2024
JeffreyDallas
JeffreyDallas previously approved these changes May 6, 2024
jjohannes added a commit that referenced this pull request May 7, 2024
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
nathanklick pushed a commit that referenced this pull request May 10, 2024
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
@jjohannes jjohannes force-pushed the 11568-update-gradle branch 3 times, most recently from d0c3d8a to fd043d1 Compare May 15, 2024 07:39
@jjohannes jjohannes requested review from JeffreyDallas and removed request for netopyr and acuarica May 15, 2024 07:40
@jjohannes
Copy link
Collaborator Author

@JeffreyDallas I cleaned up the PR and move some changes in documentation out of this one. Now there are no other approvals required. Could you re-approve?

@jjohannes jjohannes force-pushed the 11568-update-gradle branch 2 times, most recently from b2a6d3e to cc4e9b7 Compare May 15, 2024 08:08
Copy link

codecov bot commented May 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.74%. Comparing base (781dd27) to head (dd76e88).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop   #12997      +/-   ##
=============================================
- Coverage      61.76%   61.74%   -0.02%     
- Complexity     31236    31246      +10     
=============================================
  Files           3442     3446       +4     
  Lines         141226   141291      +65     
  Branches       14775    14779       +4     
=============================================
+ Hits           87222    87235      +13     
- Misses         50119    50170      +51     
- Partials        3885     3886       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
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.

None yet

3 participants