-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Conversation
…use with ethGetLogs
…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
…wrapper generator
… enabled (--fat-db), null otherwise."
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.
…use with ethGetLogs
FIXME Have those exceptions to be checked? Why not get rid of them?
Rebuild the filter if the filter is invalid
Used web3j APIs
…ukla-patch-1 Added reference of ethereum JDBC Driver
…shing Fixes events hashing computation
fix List<Boolean> type transfer bug
Make http error handling more informative
Remove unused walletFile.setCrypto(crypto)
MAINNET not MAIN_NET
[hyperledger-web3j#545] add missing constructor of WalletUtils by using fullWalletFile default
@void-main I presume you've seen the build isn't working? |
@conor10 yes, working on that |
Codecov Report
@@ 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
Continue to review full report at Codecov.
|
@conor10 fixed the failed test cases. |
@void-main Have you tried building on the command line with Gradle? There's Java 8 specific code in the merge (search for |
@conor10 I tried to build with |
When I run the build myself locally it fails:
|
@conor10 Oh, boy, the websocket package is a mess, I have to replace every |
No problem - your work is much appreciated. |
This will be addressed in #769, closing this PR. |
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.