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.

Sign up for GitHub

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

Jump to bottom

Web3j fix android #2122

Merged
merged 114 commits into from
Dec 13, 2024
Merged

Web3j fix android #2122

merged 114 commits into from
Dec 13, 2024

Conversation

shashankiitbhu
Copy link

@shashankiitbhu shashankiitbhu commented Dec 3, 2024 •
edited
Loading

What does this PR do?

required

Where should the reviewer start?

required

Why is it needed?

required

Checklist

  • I've read the contribution guidelines.
  • I've added tests (if applicable).
  • I've added a changelog entry if necessary.

@shashankiitbhu shashankiitbhu changed the base branch from web3j-android to main December 3, 2024 16:00
@shashankiitbhu shashankiitbhu changed the base branch from main to web3j-android December 3, 2024 16:01
shashankiitbhu and others added 24 commits December 3, 2024 21:34
@shashankiitbhu
minSDKversion updated
a6c727e 
Signed-off-by: Shashank Kumar <[email protected]>
@NickSneo @shashankiitbhu
change default branch to main
660a66e 
Signed-off-by: Nischal Sharma <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update secrets
11e7c7e 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update changelog
f0d0c9e 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update build
657d148 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
fix yaml
131ffdf 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update signature
0b44508 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update changelog
f2678b9 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
revert changes
c4103ab 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update changelog
34d369d 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update secrets
561a712 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@NickSneo @shashankiitbhu
main branch configs
98cd600 
Signed-off-by: Nischal Sharma <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@NickSneo @shashankiitbhu
changelog entry
8da85dd 
Signed-off-by: Nischal Sharma <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@NickSneo @shashankiitbhu
web3j release fix
86b6d61 
Signed-off-by: Nischal Sharma <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@NickSneo @shashankiitbhu
web3j release fix
48453f0 
Signed-off-by: Nischal Sharma <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
add contributtor call
9cc22f3 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update links
ce21072 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update contributing
ec394e0 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@hanmz @shashankiitbhu
Fix typos in class FullDebugTraceInfo
5b56061 
Signed-off-by: Hanmz <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@hanmz @shashankiitbhu
Fix typos in class FullDebugTraceInfo
98e128e 
Signed-off-by: hanmz <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@hanmz @shashankiitbhu
[bug] Fix two typos in package org.web3j.abi
53e67e4 
Signed-off-by: hanmz <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update signature
bbc5c89 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
update changelog
cb9404f 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean @shashankiitbhu
revert changes
b07aac7 
Signed-off-by: gtebrean <[email protected]>
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fixing build issues
8c5d8f4 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fixing build issues in codegen
cc63051 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fix codegen build issues
2351af7 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fix codegen build issues
c420a1a 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fix codegen build issues
c1bd261 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
fix codegen build issues
7d8748c 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Rename .java to .kt
b28c51b 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
codegen module test fix
314de43 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
crypto module test fix
56517b8 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Integration Test Fix
f5a0b8b 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Integration Test Fix
c56f29c 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Integration Test Fix
5d442a4 
Signed-off-by: Shashank Kumar <[email protected]>
gtebrean
gtebrean reviewed Dec 10, 2024
View reviewed changes
Copy link
Contributor

@gtebrean gtebrean left a comment

Choose a reason for hiding this comment

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

few comments

codegen/src/main/java/org/web3j/codegen/AbiTypesGenerator.java
@@ -260,7 +260,7 @@ private <T extends Type> void generateStaticArrayTypes(String path) throws IOExc
.addTypeVariable(typeVariableName)
.superclass(
ParameterizedTypeName.get(
new ClassName(String.valueOf(StaticArray.class)), typeVariableName))
new ClassName("org.web3j.abi.datatypes", "StaticArray"), typeVariableName))
Copy link
Contributor

Choose a reason for hiding this comment

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

I remember that in the end we said that we won't update the codegen module, anything change? with what exactly are these modiffication helping?

codegen/src/main/java/org/web3j/codegen/unit/gen/kotlin/KotlinClassGenerator.java
FileSpec kotlinFile =
FileSpec.builder(packageName, theContract.getSimpleName() + "Test")
.addType(testClass)
.build();
kotlinFile.writeTo(new File(writePath));

Copy link
Contributor

Choose a reason for hiding this comment

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

So as JavaClassGenerator is commented out only do we generate only kotlin test classes ?

codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java
@@ -1004,7 +1036,7 @@
//
// @Test
// public void testBuildFunctionLinkBinaryWithReferences() throws Exception {
// MethodSpec methodSpec = solidityFunctionWrapper.buildLinkLibraryMethod();
// FunSpec methodSpec = solidityFunctionWrapper.buildLinkLibraryMethod();
Copy link
Contributor

Choose a reason for hiding this comment

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

All these will be uncommented when will generate the Kotlin wrapper class?

@gtebrean
Copy link
Contributor

From what I see build on this PR is not executed at all, only the DCO takes place, please check why this is happening, the build script is in the same folder where is the release script. You can find in this PR all the jobs which needs to be executed #2124

@shashankiitbhu
build workflow modified
9bf62de 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
workflows added
cee6462 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
codegen fixed
b7cbf7f 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Integration test build fix
7258070 
Signed-off-by: Shashank Kumar <[email protected]>
@shashankiitbhu
Integration-tests fix
9ce2517 
Signed-off-by: Shashank Kumar <[email protected]>
@gtebrean gtebrean merged commit 1b480d5 into hyperledger-web3j:web3j-android Dec 13, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gtebrean gtebrean gtebrean left review comments

@conor10 conor10 Awaiting requested review from conor10 conor10 is a code owner

@NickSneo NickSneo Awaiting requested review from NickSneo NickSneo is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.