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

Merged
merged 4 commits into from
May 16, 2024

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.)

@jjohannes jjohannes requested review from a team as code owners April 25, 2024 10:39
@jjohannes jjohannes requested a review from a team April 25, 2024 10:39
@jjohannes jjohannes requested review from a team as code owners April 25, 2024 10:39
Copy link

github-actions bot commented Apr 25, 2024

Node: HAPI Test (Restart) Results

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

Results for commit c745d68.

♻️ 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 ✅  9m 15s ⏱️
2 suites  0 💤
2 files    0 ❌

Results for commit c745d68.

♻️ 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 ✅  20m 3s ⏱️
 17 suites    2 💤
 17 files      0 ❌

Results for commit c745d68.

♻️ 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 ✅  44m 57s ⏱️
 25 suites    0 💤
 25 files      0 ❌

Results for commit a4aef57.

♻️ 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 ✅  40m 6s ⏱️
 77 suites   10 💤
 77 files      0 ❌

Results for commit c745d68.

♻️ 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 ✅  54m 20s ⏱️
 3 suites   0 💤
 3 files     0 ❌

Results for commit 54f4115.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Apr 25, 2024

Node: Unit Test Results

  2 309 files  ±0    2 309 suites  ±0   3h 33m 6s ⏱️ + 1h 17m 20s
118 994 tests ±0  118 927 ✅ ±0  67 💤 ±0  0 ❌ ±0 
127 555 runs  ±0  127 488 ✅ ±0  67 💤 ±0  0 ❌ ±0 

Results for commit c745d68. ± Comparison against base commit 919b0d7.

This pull request removes 4026 and adds 3790 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@dfb05298
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [11] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@b9b42814
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [12] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@bb76e206
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [13] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@657c9816
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [14] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@f06329dd
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [15] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@59d9a7ba
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [16] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@20ac668f
…

♻️ 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 43s ⏱️
 63 suites    0 💤
 63 files      0 ❌

Results for commit 54f4115.

♻️ 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
@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
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Apr 30, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Apr 30, 2024
@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 67.21%. Comparing base (919b0d7) to head (c745d68).

Additional details and impacted files
@@              Coverage Diff              @@
##             develop   #12997      +/-   ##
=============================================
- Coverage      67.23%   67.21%   -0.03%     
+ Complexity     36166    36160       -6     
=============================================
  Files           3700     3700              
  Lines         148961   148961              
  Branches       15501    15501              
=============================================
- Hits          100155   100124      -31     
- Misses         44483    44507      +24     
- Partials        4323     4330       +7     

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

@jjohannes jjohannes force-pushed the 11568-update-gradle branch 2 times, most recently from dd76e88 to 54f4115 Compare May 16, 2024 05:20
@jjohannes jjohannes removed request for a team May 16, 2024 10:26
@jjohannes jjohannes merged commit 32c6bbb into develop May 16, 2024
39 of 42 checks passed
@jjohannes jjohannes deleted the 11568-update-gradle branch May 16, 2024 12:57
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request May 17, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request May 24, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 3, 2024
bilyana-gospodinova pushed a commit that referenced this pull request Jun 13, 2024
…es (#12997)

Signed-off-by: Jendrik Johannes <[email protected]>
Signed-off-by: Bilyana Gospodinova <[email protected]>
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 13, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 14, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 14, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 14, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 18, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jun 18, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jul 4, 2024
jjohannes added a commit to hashgraph/hedera-sdk-java that referenced this pull request Jul 4, 2024
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.

4 participants