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

Merge code from master branch to android branch #626

Closed
wants to merge 181 commits into from

Conversation

void-main
Copy link

@void-main void-main commented Jul 10, 2018

I managed to merge code from master to android branch and changed the version to 3.4.0-android.

I really need this merge to make MnemonicUtils work on android.

xaviarias and others added 30 commits February 27, 2018 19:20
…as_for_contract

# RESOLVED Conflicts:
#	codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java
#	codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java
#	integration-tests/src/test/java/org/web3j/generated/Arrays.java
#	integration-tests/src/test/java/org/web3j/generated/HumanStandardToken.java
#	integration-tests/src/test/java/org/web3j/generated/ShipIt.java
2. Removed hardcoded Log package reference.
2. Added suppress warning annotation to codegen for working with array types.
3. Bumped version to 3.3.1.
FIXME Have those exceptions to be checked? Why not get rid of them?
@void-main void-main mentioned this pull request Jul 10, 2018
@conor10
Copy link
Contributor

conor10 commented Jul 12, 2018

@void-main I presume you've seen the build isn't working?

@void-main
Copy link
Author

@conor10 yes, working on that

@void-main void-main changed the base branch from master to android July 16, 2018 01:10
@codecov
Copy link

codecov bot commented Jul 16, 2018

Codecov Report

Merging #626 into android will increase coverage by 0.29%.
The diff coverage is 78.9%.

Impacted file tree graph

@@              Coverage Diff              @@
##             android     #626      +/-   ##
=============================================
+ Coverage      75.91%   76.21%   +0.29%     
- Complexity      1604     1769     +165     
=============================================
  Files            209      240      +31     
  Lines           6170     6768     +598     
  Branches         980     1016      +36     
=============================================
+ Hits            4684     5158     +474     
- Misses          1256     1365     +109     
- Partials         230      245      +15
Impacted Files Coverage Δ Complexity Δ
...rity/methods/response/ParityAddressesResponse.java 100% <ø> (ø) 2 <0> (ø) ⬇️
crypto/src/main/java/org/web3j/crypto/Wallet.java 75.23% <ø> (-0.24%) 13 <0> (ø)
...rc/main/java/org/web3j/protocol/core/Response.java 95.83% <ø> (ø) 11 <0> (ø) ⬇️
...src/main/java/org/web3j/crypto/RawTransaction.java 89.47% <ø> (ø) 10 <0> (ø) ⬇️
core/src/main/java/org/web3j/ens/EnsResolver.java 67.24% <ø> (ø) 14 <0> (ø) ⬇️
...c/main/java/org/web3j/protocol/core/RpcErrors.java 0% <0%> (ø) 0 <0> (?)
...ocol/core/methods/response/MinerStartResponse.java 0% <0%> (ø) 0 <0> (?)
.../protocol/websocket/events/SyncingNotfication.java 0% <0%> (ø) 0 <0> (?)
...java/org/web3j/protocol/admin/JsonRpc2_0Admin.java 88.88% <0%> (-11.12%) 7 <0> (ø)
.../src/main/java/org/web3j/protocol/admin/Admin.java 0% <0%> (ø) 0 <0> (?)
... and 92 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 a007536...ad25e75. Read the comment docs.

@void-main
Copy link
Author

@conor10 fixed the failed test cases.

@conor10
Copy link
Contributor

conor10 commented Jul 24, 2018

@void-main Have you tried building on the command line with Gradle? There's Java 8 specific code in the merge (search for -> in the diffs) which will break the backward compatibility.

@void-main
Copy link
Author

@conor10 I tried to build with gradlew build and it actually passed.. But I did see some -> in diff files, I'll take a look.

@conor10
Copy link
Contributor

conor10 commented Jul 25, 2018

When I run the build myself locally it fails:

$ ./gradlew clean check
Starting a Gradle Daemon (subsequent builds will be faster)
Support for running Gradle using Java 7 has been deprecated and is scheduled to be removed in Gradle 5.0. Please see https://docs.gradle.org/4.3/userguide/java_plugin.html#sec:java_cross_compilation for more details.

> Task :abi:compileJava FAILED
/Users/Conor/code/java/web3j-android/abi/src/main/java/org/web3j/abi/datatypes/Event.java:32: error: ')' expected
                .filter(TypeReference::isIndexed)
                                     ^
/Users/Conor/code/java/web3j-android/abi/src/main/java/org/web3j/abi/datatypes/Event.java:32: error: illegal start of expression
                .filter(TypeReference::isIndexed)
                                      ^
/Users/Conor/code/java/web3j-android/abi/src/main/java/org/web3j/abi/datatypes/Event.java:32: error: ';' expected
                .filter(TypeReference::isIndexed)
                                                ^
/Users/Conor/code/java/web3j-android/abi/src/main/java/org/web3j/abi/datatypes/Event.java:38: error: illegal start of expression
                .filter(p -> !p.isIndexed())
                           ^
4 errors

@void-main
Copy link
Author

@conor10 Oh, boy, the websocket package is a mess, I have to replace every CompletableFuture with Future, I mean, kind of a re-write thing, gonna need some time..

@conor10
Copy link
Contributor

conor10 commented Jul 26, 2018

No problem - your work is much appreciated.

@snazha-blkio snazha-blkio added this to the 3.6-android milestone Oct 19, 2018
@snazha-blkio snazha-blkio added the duplicate issue/PR is a duplicate of another issue/PR label Oct 19, 2018
@snazha-blkio snazha-blkio removed this from the 3.6-android milestone Nov 14, 2018
@snazha-blkio
Copy link
Contributor

This will be addressed in #769, closing this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
duplicate issue/PR is a duplicate of another issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.