Skip to content
This repository was archived by the owner on Jul 23, 2024. It is now read-only.

Commit 64fc096

Browse files
committed
Merge branch 'release/v1.0.2'
# Conflicts: # build.gradle # core/src/test/java/com/klaytn/caver/base/Accounts.java # core/src/test/java/com/klaytn/caver/base/LocalValues.java # core/src/test/java/com/klaytn/caver/feature/RpcTest.java # integration-test/src/test/resources/build.sh
2 parents fb9df54 + b8e0e3e commit 64fc096

File tree

177 files changed

+291
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+291
-203
lines changed

.circleci/config.yml

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,53 @@
1-
# Use the latest 2.1 version of CircleCI pipeline processing engine, see https://circleci.com/docs/2.0/configuration-reference/
2-
version: 2.1
3-
4-
# Use a package of configuration called an orb, see https://circleci.com/docs/2.0/orb-intro/
5-
orbs:
6-
# Declare a dependency on the welcome-orb
7-
welcome: circleci/[email protected]
8-
9-
# Orchestrate or schedule a set of jobs, see https://circleci.com/docs/2.0/workflows/
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/circleci-caver-java
5+
machine:
6+
image: ubuntu-1604:201903-01
7+
steps:
8+
- checkout
9+
- run:
10+
name: Pull and tag Klaytn image
11+
command: |
12+
docker pull kjhman21/dev:v1.0.0
13+
docker image tag kjhman21/dev:v1.0.0 klaytn
14+
- run:
15+
name: Start test network
16+
working_directory: .circleci/images
17+
command: docker-compose up -d
18+
- run:
19+
name: Build and test
20+
command: |
21+
./gradlew clean
22+
./gradlew build --scan --debug
23+
deploy:
24+
working_directory: ~/circleci-caver-java
25+
docker:
26+
- image: circleci/openjdk:8-jdk-browsers
27+
steps:
28+
- checkout
29+
- run:
30+
command: ./gradlew release
1031
workflows:
11-
# Name the workflow "Welcome"
12-
Welcome:
13-
# Run the welcome/run job in its own container
32+
version: 2
33+
caver-java-ci:
1434
jobs:
15-
- welcome/run
16-
35+
- build:
36+
filters:
37+
tags:
38+
only: /v.*/
39+
- hold:
40+
filters:
41+
tags:
42+
only: /v.*/
43+
branches:
44+
ignore: /.*/
45+
type: approval
46+
requires:
47+
- build
48+
- deploy:
49+
filters:
50+
tags:
51+
only: /v.*/
52+
requires:
53+
- hold

.circleci/images/docker-compose.yml

Lines changed: 50 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![CircleCI](https://circleci.com/gh/klaytn/caver-java/tree/master.svg?style=svg)](https://circleci.com/gh/klaytn/caver-java/tree/master)
2+
13
# caver-java: Caver Java Klaytn Dapp API
24

35
caver-java is a lightweight, high modular, convenient Java and Android library to interact with clients (nodes) on the Klaytn network:
@@ -16,14 +18,14 @@ This library is an interface which allows Java applications to easily communicat
1618
<dependency>
1719
<groupId>com.klaytn.caver</groupId>
1820
<artifactId>core</artifactId>
19-
<version>1.0.0</version>
21+
<version>1.0.2</version>
2022
</dependency>
2123
```
2224
#### gradle
2325
```groovy
24-
compile 'com.klaytn.caver:core:1.0.0'
26+
compile 'com.klaytn.caver:core:1.0.2'
2527
```
26-
If you want to use Android dependency, just append -android at the end of version. (e.g. 1.0.0-android)
28+
If you want to use Android dependency, just append -android at the end of version. (e.g. 1.0.2-android)
2729

2830
## Start a Client
2931
If you want to run your own EN (Endpoint Node), see [EN Operation Guide](https://docs.klaytn.com/node/en) to set up.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919

2020
allprojects {
2121

22-
version '1.0.1'
22+
version '1.0.2'
2323
group 'com.klaytn.caver'
2424
description 'caver-java project'
2525

@@ -210,7 +210,7 @@ configure(subprojects.findAll { it.name != 'integration-test' }) {
210210
passphrase = bintrayGpgPassphrase
211211
}
212212
mavenCentralSync {
213-
sync = true
213+
sync = false
214214
user = ossrhUsername
215215
password = ossrhPassword
216216
close = '1'

codegen/src/main/java/com/klaytn/caver/codegen/SolidityFunctionWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.fasterxml.jackson.databind.ObjectMapper;
2424
import com.klaytn.caver.Caver;
25-
import com.klaytn.caver.crpyto.KlayCredentials;
25+
import com.klaytn.caver.crypto.KlayCredentials;
2626
import com.klaytn.caver.methods.response.KlayLogs;
2727
import com.klaytn.caver.methods.response.KlayTransactionReceipt;
2828
import com.klaytn.caver.tx.SmartContract;

codegen/src/test/java/com/klaytn/caver/codegen/SolidityFunctionWrapperGeneratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SolidityFunctionWrapperGeneratorTest extends TempFileProvider {
4545
public void setUp() throws Exception {
4646
super.setUp();
4747

48-
URL url = SolidityFunctionWrapperGeneratorTest.class.getClass().getResource("/solidity");
48+
URL url = SolidityFunctionWrapperGeneratorTest.class.getResource("/solidity");
4949
solidityBaseDir = url.getPath();
5050
}
5151

core/src/main/java/com/klaytn/caver/crpyto/KlayCredentials.java renamed to core/src/main/java/com/klaytn/caver/crypto/KlayCredentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Modified and improved for the caver-java development.
1919
*/
2020

21-
package com.klaytn.caver.crpyto;
21+
package com.klaytn.caver.crypto;
2222

2323
import org.web3j.crypto.ECKeyPair;
2424
import org.web3j.crypto.Keys;

core/src/main/java/com/klaytn/caver/crpyto/KlaySignatureData.java renamed to core/src/main/java/com/klaytn/caver/crypto/KlaySignatureData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Modified and improved for the caver-java development.
1919
*/
2020

21-
package com.klaytn.caver.crpyto;
21+
package com.klaytn.caver.crypto;
2222

2323
import org.web3j.rlp.RlpList;
2424
import org.web3j.rlp.RlpString;

core/src/main/java/com/klaytn/caver/fee/FeePayer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.klaytn.caver.fee;
1717

18-
import com.klaytn.caver.crpyto.KlayCredentials;
19-
import com.klaytn.caver.crpyto.KlaySignatureData;
18+
import com.klaytn.caver.crypto.KlayCredentials;
19+
import com.klaytn.caver.crypto.KlaySignatureData;
2020
import com.klaytn.caver.utils.KlaySignatureDataUtils;
2121
import com.klaytn.caver.tx.model.KlayRawTransaction;
2222
import com.klaytn.caver.tx.type.AbstractTxType;

core/src/main/java/com/klaytn/caver/fee/FeePayerManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
import com.klaytn.caver.tx.exception.PlatformErrorException;
2424
import com.klaytn.caver.tx.manager.ErrorHandler;
25-
import com.klaytn.caver.tx.manager.NoOpTransactionReceiptProcessor;
2625
import com.klaytn.caver.tx.manager.PollingTransactionReceiptProcessor;
2726
import com.klaytn.caver.tx.manager.TransactionReceiptProcessor;
2827
import com.klaytn.caver.Caver;
29-
import com.klaytn.caver.crpyto.KlayCredentials;
28+
import com.klaytn.caver.crypto.KlayCredentials;
3029
import com.klaytn.caver.methods.response.Bytes32;
3130
import com.klaytn.caver.methods.response.Callback;
3231
import com.klaytn.caver.methods.response.KlayTransactionReceipt;

0 commit comments

Comments
 (0)