From 98b10e4bf44e7b7900cd48c0a58f16d971b445e6 Mon Sep 17 00:00:00 2001 From: Taeik Lim Date: Wed, 27 Nov 2019 20:33:33 +0900 Subject: [PATCH] Prepare for v1.3.0 --- README.md | 6 +++--- .../src/main/java/hera/contract/ContractApi.java | 4 ++++ .../wallet/src/main/java/hera/wallet/AccountHoldable.java | 1 + client/wallet/src/main/java/hera/wallet/KeyManageable.java | 1 + client/wallet/src/main/java/hera/wallet/LegacyWallet.java | 2 +- client/wallet/src/main/java/hera/wallet/QueryApi.java | 4 ++++ client/wallet/src/main/java/hera/wallet/TransactionApi.java | 4 ++++ client/wallet/src/main/java/hera/wallet/WalletApi.java | 4 ++++ client/wallet/src/main/java/hera/wallet/WalletFactory.java | 3 +++ gradle.properties | 2 +- 10 files changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5740dd2d0..141f3066f 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ This repository, heraj is java implementation for hera. ## Latest -v1.2.2 +v1.3.0 -build with aergo-protobuf [c6fff9185d4d06a425f4ad254edd0f73d4a31c84](https://github.com/aergoio/aergo-protobuf/commits/c6fff9185d4d06a425f4ad254edd0f73d4a31c84) +build with aergo-protobuf [38d6a4fce32395997efbd66d0c61edab55c8e4a2](https://github.com/aergoio/aergo-protobuf/commits/38d6a4fce32395997efbd66d0c61edab55c8e4a2) ## Compatibility -* Aergo : v1.3.x +* Aergo : v2.0.x * Java : JDK 7 or higher * Android : Android 3.0 (API 11) or higher diff --git a/client/smart-contract/src/main/java/hera/contract/ContractApi.java b/client/smart-contract/src/main/java/hera/contract/ContractApi.java index 2ba3874cf..9f2a6ad17 100644 --- a/client/smart-contract/src/main/java/hera/contract/ContractApi.java +++ b/client/smart-contract/src/main/java/hera/contract/ContractApi.java @@ -4,9 +4,13 @@ package hera.contract; +import hera.annotation.ApiAudience; +import hera.annotation.ApiStability; import hera.api.model.Fee; import hera.wallet.WalletApi; +@ApiAudience.Public +@ApiStability.Unstable public interface ContractApi { /** diff --git a/client/wallet/src/main/java/hera/wallet/AccountHoldable.java b/client/wallet/src/main/java/hera/wallet/AccountHoldable.java index 5b32bd29c..5df331243 100644 --- a/client/wallet/src/main/java/hera/wallet/AccountHoldable.java +++ b/client/wallet/src/main/java/hera/wallet/AccountHoldable.java @@ -9,6 +9,7 @@ import hera.api.model.AccountTotalVote; import hera.api.model.StakeInfo; +@Deprecated public interface AccountHoldable { /** diff --git a/client/wallet/src/main/java/hera/wallet/KeyManageable.java b/client/wallet/src/main/java/hera/wallet/KeyManageable.java index a9d22d46c..9fc1b2860 100644 --- a/client/wallet/src/main/java/hera/wallet/KeyManageable.java +++ b/client/wallet/src/main/java/hera/wallet/KeyManageable.java @@ -11,6 +11,7 @@ import java.io.Closeable; import java.util.List; +@Deprecated public interface KeyManageable extends Closeable { /** diff --git a/client/wallet/src/main/java/hera/wallet/LegacyWallet.java b/client/wallet/src/main/java/hera/wallet/LegacyWallet.java index 5fd4e318d..4f89a4114 100644 --- a/client/wallet/src/main/java/hera/wallet/LegacyWallet.java +++ b/client/wallet/src/main/java/hera/wallet/LegacyWallet.java @@ -56,7 +56,7 @@ /** * Legacy wallet with poor interfaces. I hacked some apis of WalletApi to keep behaviors of legacy - * wallet. Remove after removing account interface. + * wallet. Remove after account interface is removed. * * @author taeiklim * diff --git a/client/wallet/src/main/java/hera/wallet/QueryApi.java b/client/wallet/src/main/java/hera/wallet/QueryApi.java index 99bea3d7d..3e5edfbf1 100644 --- a/client/wallet/src/main/java/hera/wallet/QueryApi.java +++ b/client/wallet/src/main/java/hera/wallet/QueryApi.java @@ -4,6 +4,8 @@ package hera.wallet; +import hera.annotation.ApiAudience; +import hera.annotation.ApiStability; import hera.api.model.AccountAddress; import hera.api.model.AccountState; import hera.api.model.AccountTotalVote; @@ -33,6 +35,8 @@ import hera.api.model.TxHash; import java.util.List; +@ApiAudience.Public +@ApiStability.Unstable public interface QueryApi { /** diff --git a/client/wallet/src/main/java/hera/wallet/TransactionApi.java b/client/wallet/src/main/java/hera/wallet/TransactionApi.java index dfbb39488..b5127979e 100644 --- a/client/wallet/src/main/java/hera/wallet/TransactionApi.java +++ b/client/wallet/src/main/java/hera/wallet/TransactionApi.java @@ -4,6 +4,8 @@ package hera.wallet; +import hera.annotation.ApiAudience; +import hera.annotation.ApiStability; import hera.api.model.AccountAddress; import hera.api.model.Aer; import hera.api.model.BytesValue; @@ -17,6 +19,8 @@ import hera.api.model.TxHash; import java.util.List; +@ApiAudience.Public +@ApiStability.Unstable public interface TransactionApi { /** diff --git a/client/wallet/src/main/java/hera/wallet/WalletApi.java b/client/wallet/src/main/java/hera/wallet/WalletApi.java index c51c41ebe..9e487762b 100644 --- a/client/wallet/src/main/java/hera/wallet/WalletApi.java +++ b/client/wallet/src/main/java/hera/wallet/WalletApi.java @@ -4,6 +4,8 @@ package hera.wallet; +import hera.annotation.ApiAudience; +import hera.annotation.ApiStability; import hera.api.model.AccountAddress; import hera.api.model.Authentication; import hera.client.AergoClient; @@ -17,6 +19,8 @@ * @author taeiklim * */ +@ApiAudience.Public +@ApiStability.Unstable public interface WalletApi extends Signer { /** diff --git a/client/wallet/src/main/java/hera/wallet/WalletFactory.java b/client/wallet/src/main/java/hera/wallet/WalletFactory.java index 6e5c2bbf6..89ef0001e 100644 --- a/client/wallet/src/main/java/hera/wallet/WalletFactory.java +++ b/client/wallet/src/main/java/hera/wallet/WalletFactory.java @@ -4,6 +4,9 @@ package hera.wallet; +/** + * Use {@link WalletApiFactory} instead. + */ @Deprecated public class WalletFactory { diff --git a/gradle.properties b/gradle.properties index 86eabdda4..514da788b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # heraj group=io.aergo -version=1.3.0-SNAPSHOT +version=1.3.0 # java sourceJavaVersion=1.7