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

Gradle Upgrade #1013

Merged
merged 28 commits into from
Jan 15, 2024
Merged

Gradle Upgrade #1013

merged 28 commits into from
Jan 15, 2024

Conversation

gsmachado
Copy link
Member

@gsmachado gsmachado commented Jan 2, 2024

Upgrading Gradle to 8.5. This includes:

  • Checking the compatibility of all dependencies
  • Adapting all build.gradle files
  • Adapting gradle-plugin module

Pending TODOs can be found here: #948 (comment)

…with Gradle 8.5 -- including 'gradle-plugin'
@gsmachado gsmachado self-assigned this Jan 2, 2024
@gsmachado gsmachado linked an issue Jan 2, 2024 that may be closed by this pull request
@codecov-commenter
Copy link

codecov-commenter commented Jan 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (52ab004) 73.13% compared to head (49f206a) 73.16%.
Report is 11 commits behind head on main.

❗ Current head 49f206a differs from pull request most recent head 13cc801. Consider uploading reports for the commit 13cc801 to get more accurate results

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1013      +/-   ##
============================================
+ Coverage     73.13%   73.16%   +0.02%     
  Complexity     3011     3011              
============================================
  Files           320      320              
  Lines         10649    10649              
  Branches       1335     1335              
============================================
+ Hits           7788     7791       +3     
  Misses         2203     2203              
+ Partials        658      655       -3     

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

@gsmachado
Copy link
Member Author

@csmuller

ok, even if this PR is set as a draft, can you please execute the following and check if you get the same outcome (see below)?

image

It means that all integration tests (int-tests) passed, with the exception of the ones with Neo Express.

Let me know.

@gsmachado gsmachado linked an issue Jan 4, 2024 that may be closed by this pull request
@gsmachado
Copy link
Member Author

@csmuller please, also run this:

image

🎉

Thanks!

@csmuller
Copy link
Member

csmuller commented Jan 5, 2024

@gsmachado

  1. ./gradlew :int-tests:integrationTest
    Screenshot 2024-01-05 at 13 08 55

  2. ./gradlew :gradle-plugin:integrationTest
    Screenshot 2024-01-05 at 13 10 35

@gsmachado gsmachado marked this pull request as ready for review January 5, 2024 13:35
@gsmachado
Copy link
Member Author

@csmuller ok, I think now I reached a state where this can be reviewed. 😸

BESIDES the review, can you please:

  1. Fetch this branch locally, and publish to maven local (./gradlew --info --no-build-cache -Psnapshot clean publishToMavenLocal) as a SNAPSHOT
  2. Test the 3.22.0-SNAPSHOT of the gradle-plugin in the following repos: https://github.com/neow3j/neow3j-boilerplate-contracts and https://github.com/neow3j/neow3j-examples-java. Don't forget to use Gradle 6.0, minimally, and Gradle 8.5 (recommended version). Also, just use Java 1.8 (since this is the minimum version we support). In the test, try to use neow3Compile task.

🍀 🤞

build.gradle Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
contract/build.gradle Outdated Show resolved Hide resolved
devpack/build.gradle Outdated Show resolved Hide resolved
compiler/build.gradle Outdated Show resolved Hide resolved
gradle-plugin/build.gradle Outdated Show resolved Hide resolved
neofs/build.gradle Show resolved Hide resolved
…ginUtils.java

Co-authored-by: Claude Muller <claude@axlabs.com>
@csmuller
Copy link
Member

@gsmachado Tests in our example/boilerplate repos were successful with gradle versions 6.0 - 8.0. Confirming that below 6.0 it doesn't work.

We'll have to instruct devs to update their gradle wrapper with ./gradlew wrapper --gradle-version 8.0 in the release notes.

@csmuller csmuller added this to the v3.22.0 milestone Jan 11, 2024
@gsmachado
Copy link
Member Author

gsmachado commented Jan 15, 2024

We'll have to instruct devs to update their gradle wrapper with ./gradlew wrapper --gradle-version 8.0 in the release notes.

Not necessarily. They can still run with Gradle 6.0 if they want to. But, yes, I agree: we should recommend that devs should use --gradle-version 8.0.

@gsmachado
Copy link
Member Author

@csmuller assigning this to you.

Please test on:

If the tests are successful, then let's merge. 😄

@csmuller
Copy link
Member

Test were successful 🙌
Just one open comment left.

@csmuller csmuller merged commit 343e458 into main Jan 15, 2024
4 checks passed
@csmuller csmuller deleted the feature/gradle_upgrade branch January 15, 2024 16:18
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.

Upgrade Gradle Version Migrate gradle-plugin integration tests to JUnit 5
3 participants