Skip to content

Commit

Permalink
chore: rename 'sdk' to 'sdk-java' (#2198)
Browse files Browse the repository at this point in the history
Signed-off-by: Jendrik Johannes <[email protected]>
  • Loading branch information
jjohannes authored Jan 29, 2025
1 parent 9e76530 commit 3783f8d
Show file tree
Hide file tree
Showing 892 changed files with 3,798 additions and 3,779 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
cache-read-only: false

- name: Build SDK & Javadoc
run: ./gradlew assemble :sdk:javadoc
run: ./gradlew assemble

test:
name: Unit and Integration Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: ./gradlew compileJava

- name: Generate Javadoc
run: ./gradlew sdk:javadoc
run: ./gradlew :sdk-java:javadoc

- name: Pages
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
cache-read-only: false

- name: Compile SDK & Javadoc
run: ./gradlew assemble :sdk:javadoc
run: ./gradlew assemble

- name: Nexus Release
if: ${{ github.event_name == 'push' }}
Expand Down
2 changes: 1 addition & 1 deletion example-android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
implementation(platform("org.hiero:hiero-dependency-versions"))
// ---------------------------------------------

implementation("org.hiero.sdk:sdk:2.46.0")
implementation("org.hiero.sdk:sdk-java:2.46.0")

implementation("com.google.android.material:material:1.11.0")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import org.hiero.android_example.R
import org.hiero.sdk.AccountBalanceQuery
import org.hiero.sdk.AccountId
import org.hiero.sdk.Client
import org.hiero.sdk.PrecheckStatusException
import org.hiero.sdk.java.AccountBalanceQuery
import org.hiero.sdk.java.AccountId
import org.hiero.sdk.java.Client
import org.hiero.sdk.java.PrecheckStatusException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import org.hiero.android_example.R
import org.hiero.sdk.*
import org.hiero.sdk.java.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.os.Bundle
import android.view.View
import org.hiero.android_example.R
import androidx.fragment.app.Fragment
import org.hiero.sdk.PrivateKey
import org.hiero.sdk.java.PrivateKey

class PrivateKeyFragment : Fragment() {
private lateinit var privateKey: TextView
Expand Down
108 changes: 54 additions & 54 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,84 +2,84 @@

### SDK

* [Construct a client](../examples/src/main/java/org/hiero/sdk/examples/ConstructClientExample.java)
* [Generate a key](../examples/src/main/java/org/hiero/sdk/examples/GenerateKeyExample.java)
* [Generate a key (with mnemonic)](../examples/src/main/java/org/hiero/sdk/examples/GenerateKeyWithMnemonicExample.java)
* [Get address book](../examples/src/main/java/org/hiero/sdk/examples/GetAddressBookExample.java)
* [Get exchange rates](../examples/src/main/java/org/hiero/sdk/examples/GetExchangeRatesExample.java)
* [Logger](../examples/src/main/java/org/hiero/sdk/examples/LoggerFunctionalitiesExample.java)
* [Construct a client](../examples/src/main/java/org/hiero/sdk/java/examples/ConstructClientExample.java)
* [Generate a key](../examples/src/main/java/org/hiero/sdk/java/examples/GenerateKeyExample.java)
* [Generate a key (with mnemonic)](../examples/src/main/java/org/hiero/sdk/java/examples/GenerateKeyWithMnemonicExample.java)
* [Get address book](../examples/src/main/java/org/hiero/sdk/java/examples/GetAddressBookExample.java)
* [Get exchange rates](../examples/src/main/java/org/hiero/sdk/java/examples/GetExchangeRatesExample.java)
* [Logger](../examples/src/main/java/org/hiero/sdk/java/examples/LoggerFunctionalitiesExample.java)

### Transactions

* [Sign a transaction](../examples/src/main/java/org/hiero/sdk/examples/SignTransactionExample.java)
* [Transaction serialization (HIP-745)](../examples/src/main/java/org/hiero/sdk/examples/TransactionSerializationExample.java)
* [Sign a transaction](../examples/src/main/java/org/hiero/sdk/java/examples/SignTransactionExample.java)
* [Transaction serialization (HIP-745)](../examples/src/main/java/org/hiero/sdk/java/examples/TransactionSerializationExample.java)

### Schedule Transaction

* [Sign a scheduled transfer transaction](../examples/src/main/java/org/hiero/sdk/examples/ScheduleExample.java)
* [Sign a scheduled transfer transaction (with comments)](../examples/src/main/java/org/hiero/sdk/examples/ScheduledTransferExample.java)
* [Schedule identical transaction](../examples/src/main/java/org/hiero/sdk/examples/ScheduleIdenticalTransactionExample.java)
* [Schedule multisig transaction](../examples/src/main/java/org/hiero/sdk/examples/ScheduleMultiSigTransactionExample.java)
* [Schedule multisig transaction (with threshold)](../examples/src/main/java/org/hiero/sdk/examples/ScheduledTransactionMultiSigThresholdExample.java)
* [Sign a scheduled transfer transaction](../examples/src/main/java/org/hiero/sdk/java/examples/ScheduleExample.java)
* [Sign a scheduled transfer transaction (with comments)](../examples/src/main/java/org/hiero/sdk/java/examples/ScheduledTransferExample.java)
* [Schedule identical transaction](../examples/src/main/java/org/hiero/sdk/java/examples/ScheduleIdenticalTransactionExample.java)
* [Schedule multisig transaction](../examples/src/main/java/org/hiero/sdk/java/examples/ScheduleMultiSigTransactionExample.java)
* [Schedule multisig transaction (with threshold)](../examples/src/main/java/org/hiero/sdk/java/examples/ScheduledTransactionMultiSigThresholdExample.java)

### Accounts and HBAR

* [Create an account](../examples/src/main/java/org/hiero/sdk/examples/CreateAccountExample.java)
* [Create an account (threshold key)](../examples/src/main/java/org/hiero/sdk/examples/CreateAccountThresholdKeyExample.java)
* [Create an account (with alias)](../examples/src/main/java/org/hiero/sdk/examples/CreateAccountWithAliasExample.java)
* [Create an account (with alias and receiver signature required)](../examples/src/main/java/org/hiero/sdk/examples/CreateAccountWithAliasAndReceiverSignatureRequiredExample.java)
* [Account creation ways](../examples/src/main/java/org/hiero/sdk/examples/AccountCreationWaysExample.java)
* [Create an account with Hts](../examples/src/main/java/org/hiero/sdk/examples/AccountCreateWithHtsExample.java)
* [Auto create an account with transfer transaction](../examples/src/main/java/org/hiero/sdk/examples/AutoCreateAccountTransferTransactionExample.java)
* [Account alias](../examples/src/main/java/org/hiero/sdk/examples/AccountAliasExample.java)
* [Account allowance](../examples/src/main/java/org/hiero/sdk/examples/AccountAllowanceExample.java)
* [Get account info](../examples/src/main/java/org/hiero/sdk/examples/GetAccountInfoExample.java)
* [Get account balance](../examples/src/main/java/org/hiero/sdk/examples/GetAccountBalanceExample.java)
* [Update an account](../examples/src/main/java/org/hiero/sdk/examples/UpdateAccountPublicKeyExample.java)
* [Delete an account](../examples/src/main/java/org/hiero/sdk/examples/DeleteAccountExample.java)
* [Staking](../examples/src/main/java/org/hiero/sdk/examples/StakingExample.java)
* [Staking (with update)](../examples/src/main/java/org/hiero/sdk/examples/StakingWithUpdateExample.java)
* [Multisig](../examples/src/main/java/org/hiero/sdk/examples/MultiSigOfflineExample.java)
* [Create an account](../examples/src/main/java/org/hiero/sdk/java/examples/CreateAccountExample.java)
* [Create an account (threshold key)](../examples/src/main/java/org/hiero/sdk/java/examples/CreateAccountThresholdKeyExample.java)
* [Create an account (with alias)](../examples/src/main/java/org/hiero/sdk/java/examples/CreateAccountWithAliasExample.java)
* [Create an account (with alias and receiver signature required)](../examples/src/main/java/org/hiero/sdk/java/examples/CreateAccountWithAliasAndReceiverSignatureRequiredExample.java)
* [Account creation ways](../examples/src/main/java/org/hiero/sdk/java/examples/AccountCreationWaysExample.java)
* [Create an account with Hts](../examples/src/main/java/org/hiero/sdk/java/examples/AccountCreateWithHtsExample.java)
* [Auto create an account with transfer transaction](../examples/src/main/java/org/hiero/sdk/java/examples/AutoCreateAccountTransferTransactionExample.java)
* [Account alias](../examples/src/main/java/org/hiero/sdk/java/examples/AccountAliasExample.java)
* [Account allowance](../examples/src/main/java/org/hiero/sdk/java/examples/AccountAllowanceExample.java)
* [Get account info](../examples/src/main/java/org/hiero/sdk/java/examples/GetAccountInfoExample.java)
* [Get account balance](../examples/src/main/java/org/hiero/sdk/java/examples/GetAccountBalanceExample.java)
* [Update an account](../examples/src/main/java/org/hiero/sdk/java/examples/UpdateAccountPublicKeyExample.java)
* [Delete an account](../examples/src/main/java/org/hiero/sdk/java/examples/DeleteAccountExample.java)
* [Staking](../examples/src/main/java/org/hiero/sdk/java/examples/StakingExample.java)
* [Staking (with update)](../examples/src/main/java/org/hiero/sdk/java/examples/StakingWithUpdateExample.java)
* [Multisig](../examples/src/main/java/org/hiero/sdk/java/examples/MultiSigOfflineExample.java)

### Consensus Service

* [Create a topic](../examples/src/main/java/org/hiero/sdk/examples/CreateTopicExample.java)
* [Topic management](../examples/src/main/java/org/hiero/sdk/examples/TopicWithAdminKeyExample.java)
* [Consensus Pub Sub](../examples/src/main/java/org/hiero/sdk/examples/ConsensusPubSubExample.java)
* [Consensus Pub Sub (chunked)](../examples/src/main/java/org/hiero/sdk/examples/ConsensusPubSubChunkedExample.java)
* [Consensus Pub Sub (with submit key)](../examples/src/main/java/org/hiero/sdk/examples/ConsensusPubSubWithSubmitKeyExample.java)
* [Create a topic](../examples/src/main/java/org/hiero/sdk/java/examples/CreateTopicExample.java)
* [Topic management](../examples/src/main/java/org/hiero/sdk/java/examples/TopicWithAdminKeyExample.java)
* [Consensus Pub Sub](../examples/src/main/java/org/hiero/sdk/java/examples/ConsensusPubSubExample.java)
* [Consensus Pub Sub (chunked)](../examples/src/main/java/org/hiero/sdk/java/examples/ConsensusPubSubChunkedExample.java)
* [Consensus Pub Sub (with submit key)](../examples/src/main/java/org/hiero/sdk/java/examples/ConsensusPubSubWithSubmitKeyExample.java)

### Token Service

* [Transfer Hbar](../examples/src/main/java/org/hiero/sdk/examples/TransferCryptoExample.java)
* [Transfer Hbar (multi app)](../examples/src/main/java/org/hiero/sdk/examples/MultiAppTransferExample.java)
* [Transfer tokens](../examples/src/main/java/org/hiero/sdk/examples/TransferTokensExample.java)
* [Transfer using EVM address](../examples/src/main/java/org/hiero/sdk/examples/TransferUsingEvmAddressExample.java)
* [Custom fees](../examples/src/main/java/org/hiero/sdk/examples/CustomFeesExample.java)
* [Custom fees (exempt)](../examples/src/main/java/org/hiero/sdk/examples/ExemptCustomFeesExample.java)
* [NFT Allowances](../examples/src/main/java/org/hiero/sdk/examples/NftAddRemoveAllowancesExample.java)
* [Zero token operations](../examples/src/main/java/org/hiero/sdk/examples/ZeroTokenOperationsExample.java)
* [Change Or Remove Existing Keys From A Token (HIP-540)](../examples/src/main/java/org/hiero/sdk/examples/ChangeRemoveTokenKeys.java)
* [Reject A Token (HIP-904)](../examples/src/main/java/org/hiero/sdk/examples/TokenRejectExample.java)
* [Transfer Hbar](../examples/src/main/java/org/hiero/sdk/java/examples/TransferCryptoExample.java)
* [Transfer Hbar (multi app)](../examples/src/main/java/org/hiero/sdk/java/examples/MultiAppTransferExample.java)
* [Transfer tokens](../examples/src/main/java/org/hiero/sdk/java/examples/TransferTokensExample.java)
* [Transfer using EVM address](../examples/src/main/java/org/hiero/sdk/java/examples/TransferUsingEvmAddressExample.java)
* [Custom fees](../examples/src/main/java/org/hiero/sdk/java/examples/CustomFeesExample.java)
* [Custom fees (exempt)](../examples/src/main/java/org/hiero/sdk/java/examples/ExemptCustomFeesExample.java)
* [NFT Allowances](../examples/src/main/java/org/hiero/sdk/java/examples/NftAddRemoveAllowancesExample.java)
* [Zero token operations](../examples/src/main/java/org/hiero/sdk/java/examples/ZeroTokenOperationsExample.java)
* [Change Or Remove Existing Keys From A Token (HIP-540)](../examples/src/main/java/org/hiero/sdk/java/examples/ChangeRemoveTokenKeys.java)
* [Reject A Token (HIP-904)](../examples/src/main/java/org/hiero/sdk/java/examples/TokenRejectExample.java)

### File Service

* [Create a file](../examples/src/main/java/org/hiero/sdk/examples/CreateFileExample.java)
* [File append (chunked)](../examples/src/main/java/org/hiero/sdk/examples/FileAppendChunkedExample.java)
* [Get file contents](../examples/src/main/java/org/hiero/sdk/examples/GetFileContentsExample.java)
* [Delete a file](../examples/src/main/java/org/hiero/sdk/examples/DeleteFileExample.java)
* [Create a file](../examples/src/main/java/org/hiero/sdk/java/examples/CreateFileExample.java)
* [File append (chunked)](../examples/src/main/java/org/hiero/sdk/java/examples/FileAppendChunkedExample.java)
* [Get file contents](../examples/src/main/java/org/hiero/sdk/java/examples/GetFileContentsExample.java)
* [Delete a file](../examples/src/main/java/org/hiero/sdk/java/examples/DeleteFileExample.java)

### Smart Contract Service

* [Create a contract](../examples/src/main/java/org/hiero/sdk/examples/CreateSimpleContractExample.java)
* [Create a stateful contract](../examples/src/main/java/org/hiero/sdk/examples/CreateStatefulContractExample.java)
* [Contract nonce (HIP-729)](../examples/src/main/java/org/hiero/sdk/examples/ContractNoncesExample.java)
* [Interaction with a contract](../examples/src/main/java/org/hiero/sdk/examples/SolidityPrecompileExample.java)
* [Create a contract](../examples/src/main/java/org/hiero/sdk/java/examples/CreateSimpleContractExample.java)
* [Create a stateful contract](../examples/src/main/java/org/hiero/sdk/java/examples/CreateStatefulContractExample.java)
* [Contract nonce (HIP-729)](../examples/src/main/java/org/hiero/sdk/java/examples/ContractNoncesExample.java)
* [Interaction with a contract](../examples/src/main/java/org/hiero/sdk/java/examples/SolidityPrecompileExample.java)

### Miscellaneous

* [Checksum validation](../examples/src/main/java/org/hiero/sdk/examples/ValidateChecksumExample.java)
* [Pseudorandom Number Generator](../examples/src/main/java/org/hiero/sdk/examples/PrngExample.java)
* [Checksum validation](../examples/src/main/java/org/hiero/sdk/java/examples/ValidateChecksumExample.java)
* [Pseudorandom Number Generator](../examples/src/main/java/org/hiero/sdk/java/examples/PrngExample.java)

## Usage

Expand Down
14 changes: 7 additions & 7 deletions examples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ tasks.addRule("Pattern: run<Example>: Runs an example.") {
tasks.register<JavaExec>(this) {
workingDir = rootDir
classpath = configurations.runtimeClasspath.get() + files(tasks.jar)
mainModule = "org.hiero.sdk.examples"
mainClass = "org.hiero.sdk.examples.${this@addRule.substring("run".length)}Example"
mainModule = "org.hiero.sdk.java.examples"
mainClass = "org.hiero.sdk.java.examples.${this@addRule.substring("run".length)}Example"
}
}
}
Expand Down Expand Up @@ -80,8 +80,8 @@ abstract class RunAllExample : DefaultTask() {
exec.javaexec {
workingDir = workingDirectory.get().asFile
classpath = rtClasspath
mainModule = "org.hiero.sdk.examples"
mainClass = "org.hiero.sdk.examples.$className"
mainModule = "org.hiero.sdk.java.examples"
mainClass = "org.hiero.sdk.java.examples.$className"

// NOTE: Uncomment to enable trace logs in the SDK during the examples
// jvmArgs "-Dorg.slf4j.simpleLogger.log.org.hiero=trace"
Expand All @@ -97,12 +97,12 @@ listOf("mainnet", "testnet", "previewnet").forEach { network ->
tasks.register<JavaExec>(taskName) {
workingDir = rootDir
classpath = configurations.runtimeClasspath.get() + files(tasks.jar)
mainModule = "com.hedera.hashgraph.examples"
mainClass = "com.hedera.hashgraph.sdk.examples.GetAddressBookExample"
mainModule = "org.hiero.sdk.java.examples"
mainClass = "org.hiero.sdk.java.examples.GetAddressBookExample"
environment("HEDERA_NETWORK", network)
doLast {
val binFile = File(workingDir, "address-book.proto.bin")
val target = File(workingDir, "../sdk/src/main/resources/addressbook/$network.pb")
val target = File(workingDir, "../sdk-java/src/main/resources/addressbook/$network.pb")
binFile.copyTo(target, overwrite = true)
}
}
Expand Down
4 changes: 2 additions & 2 deletions examples/gradle/modules.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.hiero.sdk=org.hiero.sdk:sdk
org.hiero.sdk.full=org.hiero.sdk:sdk-full
org.hiero.sdk.java=org.hiero.sdk:sdk-java
org.hiero.sdk.java.full=org.hiero.sdk:sdk-java-full
4 changes: 2 additions & 2 deletions examples/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
module org.hiero.sdk.examples {
requires org.hiero.sdk; // .full;
module org.hiero.sdk.java.examples {
requires org.hiero.sdk.java; // .full;
requires com.google.gson;
requires io.github.cdimascio.dotenv.java;
requires org.bouncycastle.provider;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import io.github.cdimascio.dotenv.Dotenv;
import java.util.Objects;
import org.hiero.sdk.*;
import org.hiero.sdk.logger.LogLevel;
import org.hiero.sdk.logger.Logger;
import org.hiero.sdk.java.*;
import org.hiero.sdk.java.logger.LogLevel;
import org.hiero.sdk.java.logger.Logger;

/**
* How to use auto account creation (HIP-32).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import io.github.cdimascio.dotenv.Dotenv;
import java.util.Objects;
import org.hiero.sdk.*;
import org.hiero.sdk.logger.LogLevel;
import org.hiero.sdk.logger.Logger;
import org.hiero.sdk.java.*;
import org.hiero.sdk.java.logger.LogLevel;
import org.hiero.sdk.java.logger.Logger;

/**
* How to approve and delete allowance.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import io.github.cdimascio.dotenv.Dotenv;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.hiero.sdk.*;
import org.hiero.sdk.logger.LogLevel;
import org.hiero.sdk.logger.Logger;
import org.hiero.sdk.java.*;
import org.hiero.sdk.java.logger.LogLevel;
import org.hiero.sdk.java.logger.Logger;

/**
* How to use auto account creation via HTS assets (HIP-542).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import org.hiero.sdk.AccountId;
import org.hiero.sdk.PrivateKey;
import org.hiero.sdk.PublicKey;
import org.hiero.sdk.java.AccountId;
import org.hiero.sdk.java.PrivateKey;
import org.hiero.sdk.java.PublicKey;

/**
* How to create a Hedera account in different ways.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import io.github.cdimascio.dotenv.Dotenv;
import java.util.Objects;
import org.hiero.sdk.*;
import org.hiero.sdk.logger.LogLevel;
import org.hiero.sdk.logger.Logger;
import org.hiero.sdk.java.*;
import org.hiero.sdk.java.logger.LogLevel;
import org.hiero.sdk.java.logger.Logger;

/**
* How to use auto account creation (HIP-583).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.sdk.examples;
package org.hiero.sdk.java.examples;

import io.github.cdimascio.dotenv.Dotenv;
import java.util.Objects;
import org.hiero.sdk.*;
import org.hiero.sdk.logger.LogLevel;
import org.hiero.sdk.logger.Logger;
import org.hiero.sdk.java.*;
import org.hiero.sdk.java.logger.LogLevel;
import org.hiero.sdk.java.logger.Logger;

/**
* How to change or remove existing keys from a token (HIP-540).
Expand Down
Loading

0 comments on commit 3783f8d

Please sign in to comment.