From 3590ef464f2902b3b0de2f1036d96aa0d260973b Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Mon, 30 Sep 2024 15:36:18 +0200 Subject: [PATCH] build: use plugins from 'hedera-gradle-conventions' Signed-off-by: Jendrik Johannes --- .github/workflows/build.yml | 6 +- .github/workflows/release-artifacts.yml | 5 +- build.gradle.kts | 38 ----- developers.properties | 1 + example-android/app/build.gradle.kts | 2 +- examples/build.gradle.kts | 83 ++++++++++- examples/gradle/jdk-version.txt | 1 + examples/settings.gradle.kts | 19 ++- examples/src/main/java/module-info.java | 7 +- examples/version.txt | 1 + gradle/aggregation/build.gradle.kts | 9 ++ gradle/jdk-version.txt | 1 + gradle/plugins/build.gradle.kts | 37 ----- .../kotlin/com.hedera.gradle.base.gradle.kts | 22 --- ...com.hedera.gradle.examples.java.gradle.kts | 92 ------------ .../com.hedera.gradle.java-base.gradle.kts | 87 ------------ .../kotlin/com.hedera.gradle.java.gradle.kts | 132 ------------------ ...com.hedera.gradle.patch-modules.gradle.kts | 130 ----------------- .../com.hedera.gradle.publish.gradle.kts | 87 ------------ .../com.hedera.gradle.repositories.gradle.kts | 26 ---- .../kotlin/com.hedera.gradle.root.gradle.kts | 49 ------- .../com.hedera.gradle.sdk-full.gradle.kts | 66 --------- .../kotlin/com.hedera.gradle.sdk.gradle.kts | 30 ---- ...hedera.gradle.settings.settings.gradle.kts | 65 --------- .../com.hedera.gradle.versions.gradle.kts | 26 ---- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 5 +- gradlew.bat | 2 + .../build.gradle.kts | 27 +++- sdk-full/build.gradle.kts | 53 ++++++- sdk-full/src/main/java/module-info.java | 2 - sdk/build.gradle.kts | 56 +++++++- .../hashgraph/sdk/FileAppendTransaction.java | 42 +++--- sdk/src/main/java/module-info.java | 2 - sdk/src/testIntegration/java/module-info.java | 1 - settings.gradle.kts | 26 ++-- tck/build.gradle.kts | 93 ++++++------ 38 files changed, 323 insertions(+), 1010 deletions(-) delete mode 100644 build.gradle.kts create mode 100644 developers.properties create mode 100644 examples/gradle/jdk-version.txt create mode 100644 examples/version.txt create mode 100644 gradle/aggregation/build.gradle.kts create mode 100644 gradle/jdk-version.txt delete mode 100644 gradle/plugins/build.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.base.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.examples.java.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.java-base.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.publish.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk-full.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts delete mode 100644 gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts rename {sdk-dependency-versions => hedera-dependency-versions}/build.gradle.kts (76%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 571b250e90..5f897e7403 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,8 +88,8 @@ jobs: - name: Build SDK run: ./gradlew assemble --scan - - name: Gradle Dependency Scopes Check - run: ./gradlew checkAllModuleInfo --continue --scan + - name: Code Quality Checks + run: ./gradlew qualityCheck :examples:qualityCheck --continue --scan - name: Start Local Node run: npx @hashgraph/hedera-local start -d --network local @@ -199,7 +199,7 @@ jobs: run: npx @hashgraph/hedera-local start -d --network local - name: Run TCK Unit Tests - run: ./gradlew :tck:test + run: ./gradlew :tck:test --scan - name: Stop the local node run: npx @hashgraph/hedera-local stop diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 7f6078a322..938c045530 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -125,4 +125,7 @@ jobs: - name: Nexus Release if: ${{ github.event_name == 'push' }} - run: ./gradlew closeAndReleaseSonatypeStagingRepository --no-configuration-cache --scan -PsonatypeUsername=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} + env: + NEXUS_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + run: ./gradlew releaseMavenCentral -PpublishingPackageGroup=com.hedera.hashgraph -PpublishSigningEnabled=true --scan --no-configuration-cache diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 7f58403aa8..0000000000 --- a/build.gradle.kts +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("com.hedera.gradle.root") -} - -dependencyAnalysis.abi { - exclusions { - // Exposes: org.slf4j.Logger - excludeClasses("logger") - // Exposes: com.google.common.base.MoreObjects.ToStringHelper - excludeClasses(".*\\.CustomFee") - // Exposes: com.esaulpaugh.headlong.abi.Tuple - excludeClasses(".*\\.ContractFunctionResult") - // Exposes: org.bouncycastle.crypto.params.KeyParameter - excludeClasses(".*\\.PrivateKey.*") - // Exposes: io.grpc.stub.AbstractFutureStub (and others) - excludeClasses(".*Grpc") - } -} diff --git a/developers.properties b/developers.properties new file mode 100644 index 0000000000..0811074b0e --- /dev/null +++ b/developers.properties @@ -0,0 +1 @@ +nikita.lebedev@limechain.tech=Nikita Lebedev diff --git a/example-android/app/build.gradle.kts b/example-android/app/build.gradle.kts index a5bc706ff4..c9c61b2d9a 100644 --- a/example-android/app/build.gradle.kts +++ b/example-android/app/build.gradle.kts @@ -65,7 +65,7 @@ android { dependencies { // --- Remove to use a published SDK version --- - implementation(platform("com.hedera.hashgraph:sdk-dependency-versions")) + implementation(platform("com.hedera.hashgraph:hedera-dependency-versions")) // --------------------------------------------- implementation("com.hedera.hashgraph:sdk:2.41.0") diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index dec4749860..fe48de5a00 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,11 +12,11 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ plugins { - id("com.hedera.gradle.examples.java") + id("com.hedera.gradle.module.application") + id("org.gradlex.java-module-dependencies") } mainModuleInfo { @@ -27,7 +24,81 @@ mainModuleInfo { runtimeOnly("org.slf4j.simple") } +// 'com.google.protobuf' implementation is provided through 'sdk' as it differs between 'sdk' and +// 'sdk-full' +dependencyAnalysis { + issues { + all { onUsedTransitiveDependencies { exclude("com.google.protobuf:protobuf-javalite") } } + } +} + dependencies.constraints { + implementation("io.github.cdimascio:dotenv-java:3.0.2") implementation("com.hedera.hashgraph:sdk:2.41.0") implementation("com.hedera.hashgraph:sdk-full:2.41.0") } + +tasks.register("runAllExamples") { + workingDirectory = rootDir + sources.from(sourceSets.main.get().java.asFileTree) + rtClasspath.from(configurations.runtimeClasspath.get() + files(tasks.jar)) +} + +tasks.addRule("Pattern: run: Runs an example.") { + if (startsWith("run")) { + tasks.register(this) { + workingDir = rootDir + classpath = configurations.runtimeClasspath.get() + files(tasks.jar) + mainModule = "com.hedera.hashgraph.examples" + mainClass = + "com.hedera.hashgraph.sdk.examples.${this@addRule.substring("run".length)}Example" + } + } +} + +abstract class RunAllExample : DefaultTask() { + @get:InputFiles abstract val sources: ConfigurableFileCollection + + @get:InputFiles abstract val rtClasspath: ConfigurableFileCollection + + @get:Internal abstract val workingDirectory: RegularFileProperty + + @get:Inject abstract val exec: ExecOperations + + @TaskAction + fun runAll() { + val exampleClasses = + sources + .filter { it.name.endsWith("Example.java") } + .asSequence() + .map { it.name.replace(".java", "") } + .filter { + it != "ValidateChecksumExample" + } // disabled this example, because it needs user input (but it WORKS) + .filter { + it != "ConsensusPubSubChunkedExample" + } // is flaky on local-node env, will be investigated + .toList() + + exampleClasses.forEach { className -> + println( + """ + + ---EXECUTING $className: + + """ + .trimIndent() + ) + + exec.javaexec { + workingDir = workingDirectory.get().asFile + classpath = rtClasspath + mainModule = "com.hedera.hashgraph.examples" + mainClass = "com.hedera.hashgraph.sdk.examples.$className" + + // NOTE: Uncomment to enable trace logs in the SDK during the examples + // jvmArgs "-Dorg.slf4j.simpleLogger.log.com.hedera.hashgraph=trace" + } + } + } +} diff --git a/examples/gradle/jdk-version.txt b/examples/gradle/jdk-version.txt new file mode 100644 index 0000000000..8808b7e390 --- /dev/null +++ b/examples/gradle/jdk-version.txt @@ -0,0 +1 @@ +17.0.12 diff --git a/examples/settings.gradle.kts b/examples/settings.gradle.kts index 2a19d1397d..85f5a42603 100644 --- a/examples/settings.gradle.kts +++ b/examples/settings.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,16 +12,16 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ pluginManagement { - includeBuild("../gradle/plugins") - repositories { - gradlePluginPortal() - } + repositories.gradlePluginPortal() + repositories.maven("https://repo.onepiece.software/snapshots") } +plugins { id("com.hedera.gradle.build") version "0.0.2" } + +@Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories.mavenCentral() } + // --- Remove to use a published SDK version --- -includeBuild("..") -// --------------------------------------------- +includeBuild("..") // --------------------------------------------- diff --git a/examples/src/main/java/module-info.java b/examples/src/main/java/module-info.java index dba574aac6..ed2b93d1d5 100644 --- a/examples/src/main/java/module-info.java +++ b/examples/src/main/java/module-info.java @@ -19,12 +19,9 @@ */ module com.hedera.hashgraph.examples { - requires com.hedera.hashgraph.sdk; - // requires com.hedera.hashgraph.sdk.full; - requires com.google.gson; - requires java.dotenv; + requires com.hedera.hashgraph.sdk; // .full; + requires io.github.cdimascio.dotenv.java; requires static java.annotation; - requires com.google.protobuf; } diff --git a/examples/version.txt b/examples/version.txt new file mode 100644 index 0000000000..b694fe3f6c --- /dev/null +++ b/examples/version.txt @@ -0,0 +1 @@ +0.1.0-SNAPSHOT diff --git a/gradle/aggregation/build.gradle.kts b/gradle/aggregation/build.gradle.kts new file mode 100644 index 0000000000..3f5ed69273 --- /dev/null +++ b/gradle/aggregation/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("com.hedera.gradle.base.lifecycle") + id("java") +} + +dependencies { + implementation(project(":sdk")) + implementation("io.grpc:grpc-protobuf") +} diff --git a/gradle/jdk-version.txt b/gradle/jdk-version.txt new file mode 100644 index 0000000000..8808b7e390 --- /dev/null +++ b/gradle/jdk-version.txt @@ -0,0 +1 @@ +17.0.12 diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts deleted file mode 100644 index 87a34b00b6..0000000000 --- a/gradle/plugins/build.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - `kotlin-dsl` -} - -repositories.gradlePluginPortal() - -dependencies { - implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.1.4") - implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4") - implementation("io.github.gradle-nexus:publish-plugin:1.3.0") - implementation("org.gradlex:extra-java-module-info:1.9") - implementation("org.gradlex:java-module-dependencies:1.6.5") - implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1") - - implementation("org.gradle.toolchains:foojay-resolver:0.8.0") - implementation("com.gradle:develocity-gradle-plugin:3.17.2") -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.base.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.base.gradle.kts deleted file mode 100644 index f048c89cf9..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.base.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -group = "com.hedera.hashgraph" -version = providers.fileContents(rootProject.layout.projectDirectory.file("version.txt")).asText.getOrElse("").trim() diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.examples.java.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.examples.java.gradle.kts deleted file mode 100644 index 220ceb189b..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.examples.java.gradle.kts +++ /dev/null @@ -1,92 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("application") - id("com.hedera.gradle.java-base") -} - -javaModuleDependencies { - moduleNameToGA.put("com.hedera.hashgraph.sdk", "com.hedera.hashgraph:sdk") - moduleNameToGA.put("com.hedera.hashgraph.sdk.full", "com.hedera.hashgraph:sdk-full") -} - -tasks.register("runAllExamples") { - workingDirectory = rootDir - sources.from(sourceSets.main.get().java.asFileTree) - rtClasspath.from(configurations.runtimeClasspath.get() + files(tasks.jar)) -} - -tasks.addRule("Pattern: run: Runs an example.") { - if (startsWith("run")) { - tasks.register(this) { - workingDir = rootDir - classpath = configurations.runtimeClasspath.get() + files(tasks.jar) - mainModule = "com.hedera.hashgraph.examples" - mainClass = "com.hedera.hashgraph.sdk.examples.${this@addRule.substring("run".length)}Example" - - // NOTE: Uncomment to enable trace logs in the SDK during the examples - // jvmArgs("-Dorg.slf4j.simpleLogger.log.com.hedera.hashgraph=trace") - } - } -} - -abstract class RunAllExample : DefaultTask() { - @get:InputFiles - abstract val sources: ConfigurableFileCollection - - @get:InputFiles - abstract val rtClasspath: ConfigurableFileCollection - - @get:Internal - abstract val workingDirectory: RegularFileProperty - - @get:Inject - abstract val exec: ExecOperations - - @TaskAction - fun runAll() { - val exampleClasses = sources - .filter { it.name.endsWith("Example.java") } - .asSequence() - .map { it.name.replace(".java", "") } - .filter { it != "ValidateChecksumExample" } // disabled this example, because it needs user input (but it WORKS) - .filter { it != "ConsensusPubSubChunkedExample" } // is flaky on local-node env, will be investigated - .toList() - - exampleClasses.forEach { className -> - println(""" - - ---EXECUTING $className: - - """.trimIndent()); - - exec.javaexec { - workingDir = workingDirectory.get().asFile - classpath = rtClasspath - mainModule = "com.hedera.hashgraph.examples" - mainClass = "com.hedera.hashgraph.sdk.examples.$className" - - // NOTE: Uncomment to enable trace logs in the SDK during the examples - // jvmArgs "-Dorg.slf4j.simpleLogger.log.com.hedera.hashgraph=trace" - } - } - } -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java-base.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.java-base.gradle.kts deleted file mode 100644 index ed8b4b2c6e..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java-base.gradle.kts +++ /dev/null @@ -1,87 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("java") - id("jacoco") - id("org.gradlex.java-module-dependencies") - id("com.hedera.gradle.base") - id("com.hedera.gradle.repositories") - id("com.hedera.gradle.patch-modules") -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - vendor = JvmVendorSpec.ADOPTIUM - } -} - -jacoco { - toolVersion = "0.8.8" -} - -jvmDependencyConflicts { - consistentResolution.platform("com.hedera.hashgraph:sdk-dependency-versions") -} - -val deactivatedCompileLintOptions = - listOf( - "module", // module not found when doing 'exports to ...' - "serial", // serializable class ... has no definition of serialVersionUID - "processing", // No processor claimed any of these annotations: ... - "try", // auto-closeable resource ignore is never referenced... (AutoClosableLock) - "missing-explicit-ctor", // class ... declares no explicit constructors - "removal", - "deprecation", - "overrides", // overrides equals, but neither it ... overrides hashCode method - "unchecked", - "rawtypes", - "exports", - "dep-ann" - ) - -tasks.withType().configureEach { - options.encoding = "UTF-8" - options.compilerArgs.add("-Werror") - options.compilerArgs.add("-Xlint:all,-" + deactivatedCompileLintOptions.joinToString(",-")) -} - -tasks.withType().configureEach { - isPreserveFileTimestamps = false - isReproducibleFileOrder = true - filePermissions { unix("0664") } - dirPermissions { unix("0775") } -} - -tasks.buildDependents { setGroup(null) } - -tasks.buildNeeded { setGroup(null) } - -tasks.jar { setGroup(null) } - -tasks.test { group = "build" } - -tasks.checkAllModuleInfo { group = "build" } - -sourceSets.all { - // Remove 'classes' tasks from 'build' group to keep it cleaned up - tasks.named(classesTaskName) { group = null } -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts deleted file mode 100644 index 037c2d2b0b..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts +++ /dev/null @@ -1,132 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.google.protobuf.gradle.id -import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL - -plugins { - id("java-library") - id("com.google.protobuf") - id("com.hedera.gradle.java-base") - id("com.hedera.gradle.publish") -} - -@Suppress("UnstableApiUsage") -testing.suites { - named("test") { - useJUnitJupiter() - } - register("testIntegration") { - testType = TestSuiteType.INTEGRATION_TEST - targets.all { - testTask { - group = "build" - systemProperty("CONFIG_FILE", providers.gradleProperty("CONFIG_FILE").getOrElse("")) - systemProperty("HEDERA_NETWORK", providers.gradleProperty("HEDERA_NETWORK").getOrElse("")) - systemProperty("OPERATOR_ID", providers.gradleProperty("OPERATOR_ID").getOrElse("")) - systemProperty("OPERATOR_KEY", providers.gradleProperty("OPERATOR_KEY").getOrElse("")) - } - } - } -} - -tasks.withType().configureEach { - // NOTE: Uncomment to enable trace logs in the SDK during tests - // jvmArgs("-Dorg.slf4j.simpleLogger.log.com.hedera.hashgraph=trace") - - // emit logs per passed or failed test - testLogging { - exceptionFormat = FULL - events("passed", "skipped", "failed", "standardOut", "standardError") - } - - // propagate system environment to test runner - systemProperty("OPERATOR_ID", providers.gradleProperty("OPERATOR_ID").getOrElse("")) - systemProperty("OPERATOR_KEY", providers.gradleProperty("OPERATOR_KEY").getOrElse("")) - systemProperty("CONFIG_FILE", providers.gradleProperty("CONFIG_FILE").getOrElse("")) - systemProperty("HEDERA_NETWORK", providers.gradleProperty("HEDERA_NETWORK").getOrElse("")) -} - -tasks.withType().configureEach { - options { - this as StandardJavadocDocletOptions - encoding = "UTF-8" - addStringOption("Xdoclint:all,-missing", "-quiet") - addStringOption("Xwerror", "-quiet") - } -} - -tasks.jacocoTestReport { - // make sure to use any/all test coverage data for the report and run all tests before this report is made - executionData.from( - tasks.test.map { it.extensions.getByType().destinationFile!! }, - tasks.named("testIntegration").map { it.extensions.getByType().destinationFile!! } - ) - - // remove generated proto files from report - classDirectories.setFrom(sourceSets.main.get().output.asFileTree.matching { - exclude( - "**/proto/**", - "**/AccountAllowanceAdjustTransaction.*", - "**/HederaPreCheckStatusException.*", - "**/HederaReceiptStatusException.*" - ) - }) - - // configure it so only xml is generated for the report - reports { - xml.required = true - html.required = true - csv.required = false - } -} - - -// https://github.com/google/protobuf-gradle-plugin -protobuf { - protoc { - // shouldn't be updated for now (breaking changes after 4.x.x) - artifact = "com.google.protobuf:protoc:3.25.4" - } - plugins { - id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.66.0" - } - } -} -tasks.generateProto { - plugins { plugins.register("grpc") { option("@generated=omit") } } -} - -tasks.compileJava { - options.javaModuleVersion = project.version.toString() -} - -tasks.jar { - exclude("**/*.proto") - includeEmptyDirs = false - manifest { - attributes["Implementation-Version"] = project.version - } -} - -sourceSets.all { - configurations[getTaskName("", "compileProtoPath")].extendsFrom(configurations["internal"]) -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts deleted file mode 100644 index 6282658cb9..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts +++ /dev/null @@ -1,130 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("java") - id("org.gradlex.extra-java-module-info") - id("org.gradlex.jvm-dependency-conflict-resolution") -} - -// Fix or enhance the metadata of third-party Modules. This is about the metadata in the -// repositories: '*.pom' and '*.module' files. -jvmDependencyConflicts.patch { - // These compile time annotation libraries are not of interest in our setup and are thus removed - // from the dependencies of all components that bring them in. - val annotationLibraries = - listOf( - "com.google.android:annotations", - "com.google.code.findbugs:annotations", - "com.google.code.findbugs:jsr305", - "com.google.guava:listenablefuture", - "com.google.j2objc:j2objc-annotations", - "org.checkerframework:checker-compat-qual", - "org.checkerframework:checker-qual", - "org.codehaus.mojo:animal-sniffer-annotations" - ) - - module("com.github.spotbugs:spotbugs-annotations") { annotationLibraries.forEach { removeDependency(it) } } - module("com.google.guava:guava") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-api") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-context") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-core") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-netty-shaded") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-protobuf") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-protobuf-lite") { annotationLibraries.forEach { removeDependency(it) } } - module("io.grpc:grpc-util") { annotationLibraries.forEach { removeDependency(it) } } - - // Testing only - module("org.jetbrains.kotlin:kotlin-stdlib") { removeDependency("org.jetbrains.kotlin:kotlin-stdlib-common") } - module("junit:junit") { removeDependency("org.hamcrest:hamcrest-core") } -} - -// Fix or enhance the 'module-info.class' of third-party Modules. This is about the -// 'module-info.class' inside the Jar files. In our full Java Modules setup every -// Jar needs to have this file. If it is missing, it is added by what is configured here. -extraJavaModuleInfo { - failOnAutomaticModules = true // Only allow Jars with 'module-info' on all module paths - - module("com.esaulpaugh:headlong", "headlong") - module("com.github.spotbugs:spotbugs-annotations", "com.github.spotbugs.annotations") - module("com.google.errorprone:error_prone_annotations", "com.google.errorprone.annotations") - module("com.google.guava:failureaccess", "com.google.common.util.concurrent.internal") - module("com.google.guava:guava", "com.google.common") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - } - module("com.google.protobuf:protobuf-java", "com.google.protobuf") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - requires("jdk.unsupported") - } - module("com.google.protobuf:protobuf-javalite", "com.google.protobuf") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - requires("jdk.unsupported") - } - module("io.grpc:grpc-api", "io.grpc") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - uses("io.grpc.LoadBalancerProvider") - uses("io.grpc.ManagedChannelProvider") - uses("io.grpc.NameResolverProvider") - } - module("io.grpc:grpc-context", "io.grpc.context") - module("io.grpc:grpc-core", "io.grpc.internal") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - } - module("io.grpc:grpc-inprocess", "io.grpc.inprocess") - module("io.grpc:grpc-protobuf-lite", "io.grpc.protobuf.lite") - module("io.grpc:grpc-protobuf", "io.grpc.protobuf") - module("io.grpc:grpc-stub", "io.grpc.stub") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - } - module("io.perfmark:perfmark-api", "io.perfmark") - module("com.google.code.findbugs:jsr305", "java.annotation") - module("org.jetbrains:annotations", "org.jetbrains.annotations") - - // Full protobuf only - module("com.google.api.grpc:proto-google-common-protos", "com.google.api.grpc.common") - - // Testing only - module("io.grpc:grpc-netty-shaded", "io.grpc.netty.shaded") { - exportAllPackages() - requireAllDefinedDependencies() - requires("java.logging") - requires("jdk.unsupported") - ignoreServiceProvider("reactor.blockhound.integration.BlockHoundIntegration") - } - module("io.grpc:grpc-util", "io.grpc.util") - module("io.github.cdimascio:java-dotenv", "java.dotenv") - module("io.github.json-snapshot:json-snapshot", "json.snapshot") - module("junit:junit", "junit") - module("org.mockito:mockito-core", "org.mockito") - module("org.mockito:mockito-junit-jupiter", "org.mockito.junit.jupiter") - module("org.objenesis:objenesis", "org.objenesis") -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.publish.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.publish.gradle.kts deleted file mode 100644 index bc1aa5f766..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.publish.gradle.kts +++ /dev/null @@ -1,87 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("java") - id("maven-publish") - id("signing") -} - -java { - withJavadocJar() - withSourcesJar() -} - -tasks.withType().configureEach { setGroup(null) } - -val mavenJava = publishing.publications.create("mavenJava") { - from(components["java"]) - - versionMapping { - allVariants { fromResolutionResult() } - } - - suppressAllPomMetadataWarnings() - - pom { - name = "Hedera SDK" - description = "Hedera™ Hashgraph SDK for Java" - url = "https://github.com/hashgraph/hedera-sdk-java" - - organization { - name = "Hedera Hashgraph" - url = "https://www.hedera.com" - } - - issueManagement { - system = "GitHub" - url = "https://github.com/hashgraph/hedera-sdk-java/issues" - } - - licenses { - license { - name = "Apache License, Version 2.0" - url = "https://github.com/hashgraph/hedera-sdk-java/blob/main/LICENSE" - distribution = "repo" - } - } - - scm { - url = "https://github.com/hashgraph/hedera-sdk-java" - connection = "scm:git:https://github.com/hashgraph/hedera-sdk-java.git" - developerConnection = "scm:git:ssh://github.com:hashgraph/hedera-sdk-java.git" - } - - developers { - developer { - name = "Nikita Lebedev" - } - - developer { - name = "Ivan Asenov" - } - } - } -} - -signing { - sign(mavenJava) - useGpgCmd() -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts deleted file mode 100644 index b6bfe054c1..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -repositories { - maven("https://jitpack.io") { - content { includeModule("io.github.cdimascio", "java-dotenv") } - } - mavenCentral() -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts deleted file mode 100644 index 72f33aa2a4..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("com.hedera.gradle.base") - id("com.hedera.gradle.repositories") - id("com.autonomousapps.dependency-analysis") - id("io.github.gradle-nexus.publish-plugin") -} - -val productVersion = layout.projectDirectory.file("version.txt").asFile.readText().trim() - -tasks.register("showVersion") { - group = "versioning" - - inputs.property("version", productVersion) - - doLast { println(inputs.properties["version"]) } -} - -nexusPublishing { - repositories { - sonatype { } - } -} - -tasks.named("closeSonatypeStagingRepository") { - // The publishing of all components to Maven Central is automatically done before close - // (which is done before release). - dependsOn(":sdk:publishToSonatype") - dependsOn(":sdk-full:publishToSonatype") -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk-full.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk-full.gradle.kts deleted file mode 100644 index dd9fefbdb6..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk-full.gradle.kts +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("com.hedera.gradle.java") -} - -javaModuleDependencies.moduleNameToGA.put("com.google.protobuf", "com.google.protobuf:protobuf-java") - -val sdkSrcMainProto = layout.projectDirectory.dir("../sdk/src/main/proto") -val sdkSrcMainJava = layout.projectDirectory.dir("../sdk/src/main/java").asFileTree.matching { - exclude("module-info.java") -} -val sdkSrcMainResources = layout.projectDirectory.dir("../sdk/src/main/resources") - -tasks.generateProto { - addIncludeDir(files(sdkSrcMainProto)) - addSourceDirs(files(sdkSrcMainProto)) -} - -tasks.compileJava { - source(sdkSrcMainJava) -} - -tasks.processResources { - from(sdkSrcMainResources) -} - -tasks.javadoc { - source(sdkSrcMainJava) -} - -tasks.named("sourcesJar") { - from(sdkSrcMainJava) - from(sdkSrcMainResources) -} - -// 'sdk-full' is an alternative to 'sdk'. They cannot be used together. -// We express this via capability. -val sdkCapability = "${project.group}:sdk:${project.version}" -val sdkFullCapability = "${project.group}:${project.name}:${project.version}" -configurations.apiElements { - outgoing.capability(sdkFullCapability) // The default capability - outgoing.capability(sdkCapability) // The 'sdk' capability -} -configurations.runtimeElements { - outgoing.capability(sdkFullCapability) // The default capability - outgoing.capability(sdkCapability) // The 'sdk' capability -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk.gradle.kts deleted file mode 100644 index ded6e2482a..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.sdk.gradle.kts +++ /dev/null @@ -1,30 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("com.hedera.gradle.java") -} - -javaModuleDependencies.moduleNameToGA.put("com.google.protobuf", "com.google.protobuf:protobuf-javalite") - -tasks.generateProto { - builtins.named("java") { option("lite") } - plugins.named("grpc") { option("lite") } -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts deleted file mode 100644 index 69eda36543..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts +++ /dev/null @@ -1,65 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -pluginManagement { - repositories { - gradlePluginPortal() - mavenCentral() - } -} - -plugins { - id("com.gradle.develocity") - id("org.gradle.toolchains.foojay-resolver-convention") -} - -includeBuild(".") - -// Enable Gradle Build Scan -develocity { - buildScan { - termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use" - termsOfUseAgree = "yes" - publishing.onlyIf { false } // only publish with explicit '--scan' - } -} - -val isCiServer = System.getenv().containsKey("CI") -val gradleCacheUsername: String? = System.getenv("GRADLE_CACHE_USERNAME") -val gradleCachePassword: String? = System.getenv("GRADLE_CACHE_PASSWORD") -val gradleCacheAuthorized = - (gradleCacheUsername?.isNotEmpty() ?: false) && (gradleCachePassword?.isNotEmpty() ?: false) - -buildCache { - remote { - url = uri("https://cache.gradle.hedera.svcs.eng.swirldslabs.io/cache/") - isPush = isCiServer && gradleCacheAuthorized - - isUseExpectContinue = true - isEnabled = !gradle.startParameter.isOffline - - if (isCiServer && gradleCacheAuthorized) { - credentials { - username = gradleCacheUsername - password = gradleCachePassword - } - } - } -} diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts deleted file mode 100644 index 1c32fe4b2f..0000000000 --- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2024 Hedera Hashgraph, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -plugins { - id("java-platform") - id("org.gradlex.java-module-versions") -} - -group = "com.hedera.hashgraph" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..df97d72b8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1339..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e467..9b42019c79 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/sdk-dependency-versions/build.gradle.kts b/hedera-dependency-versions/build.gradle.kts similarity index 76% rename from sdk-dependency-versions/build.gradle.kts rename to hedera-dependency-versions/build.gradle.kts index 2619378723..3ffa8c9d61 100644 --- a/sdk-dependency-versions/build.gradle.kts +++ b/hedera-dependency-versions/build.gradle.kts @@ -19,9 +19,12 @@ */ plugins { - id("com.hedera.gradle.versions") + id("com.hedera.gradle.base.lifecycle") + id("com.hedera.gradle.base.jpms-modules") } +group = "com.hedera.hashgraph" + dependencies.constraints { api("com.esaulpaugh:headlong:12.1.0") { because("headlong") @@ -41,13 +44,13 @@ dependencies.constraints { because("io.grpc") } api("io.grpc:grpc-inprocess:1.64.0") { - because("io.grpc.protobuf") + because("io.grpc.inprocess") } api("io.grpc:grpc-protobuf:1.64.0") { because("io.grpc.protobuf") } api("io.grpc:grpc-protobuf-lite:1.64.0") { - because("io.grpc.protobuf") + because("io.grpc.protobuf.lite") } api("io.grpc:grpc-stub:1.64.0") { because("io.grpc.stub") @@ -67,6 +70,9 @@ dependencies.constraints { api("org.slf4j:slf4j-simple:2.0.16") { because("org.slf4j.simple") } + api("com.google.code.findbugs:jsr305:3.0.2") { + because("javax.annotation") + } // Testing api("com.fasterxml.jackson.core:jackson-core:2.18.0") { @@ -84,6 +90,21 @@ dependencies.constraints { api("org.assertj:assertj-core:3.26.3") { because("org.assertj.core") } + api("org.junit.jupiter:junit-jupiter-api:5.10.2") { + because("org.junit.jupiter.api") + } + api("org.mockito:mockito-core:5.8.0") { + because("org.mockito") + } + api("com.google.guava:guava:33.3.1-android") { + because("com.google.common") + } + api("com.fasterxml.jackson.core:jackson-core:2.18.0") { + because("com.fasterxml.jackson.core") + } + + api("com.google.protobuf:protoc:3.25.4") + api("io.grpc:protoc-gen-grpc-java:1.66.0") // Examples api("org.jetbrains.kotlin:kotlin-stdlib:2.0.21") { diff --git a/sdk-full/build.gradle.kts b/sdk-full/build.gradle.kts index a148b6fe54..3ae361b7d7 100644 --- a/sdk-full/build.gradle.kts +++ b/sdk-full/build.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,16 +12,58 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ plugins { - id("com.hedera.gradle.sdk-full") + id("com.hedera.gradle.module.library") + id("com.hedera.gradle.feature.protobuf") } -// Define dependency constraints for gRPC implementations so that clients automatically get the correct version +description = "Hedera™ Hashgraph SDK for Java" + +// Define dependency constraints for gRPC implementations so that clients automatically get the +// correct version dependencies.constraints { api("io.grpc:grpc-netty:1.64.0") api("io.grpc:grpc-netty-shaded:1.64.0") api("io.grpc:grpc-okhttp:1.64.0") } + +javaModuleDependencies.moduleNameToGA.put( + "com.google.protobuf", + "com.google.protobuf:protobuf-java" +) + +tasks.withType().configureEach { options.compilerArgs.add("-Xlint:-exports,-dep-ann") } + +val sdkSrcMainProto = layout.projectDirectory.dir("../sdk/src/main/proto") +val sdkSrcMainJava = + layout.projectDirectory.dir("../sdk/src/main/java").asFileTree.matching { + exclude("module-info.java") + } +val sdkSrcMainResources = layout.projectDirectory.dir("../sdk/src/main/resources") + +tasks.generateProto { + addIncludeDir(files(sdkSrcMainProto)) + addSourceDirs(files(sdkSrcMainProto)) +} + +tasks.compileJava { source(sdkSrcMainJava) } + +tasks.processResources { from(sdkSrcMainResources) } + +tasks.javadoc { source(sdkSrcMainJava) } + +tasks.named("sourcesJar") { + from(sdkSrcMainJava) + from(sdkSrcMainResources) +} + +// 'sdk-full' is an alternative to 'sdk'. They cannot be used together. +// We express this via capability. +listOf(configurations.apiElements.get(), configurations.runtimeElements.get()).forEach { + it.outgoing.capability( + "${project.group}:${project.name}:${project.version}" + ) // The default capability + it.outgoing.capability("${project.group}:sdk:${project.version}") // The 'sdk' capability +} diff --git a/sdk-full/src/main/java/module-info.java b/sdk-full/src/main/java/module-info.java index 515c7989e3..574625e87b 100644 --- a/sdk-full/src/main/java/module-info.java +++ b/sdk-full/src/main/java/module-info.java @@ -20,7 +20,6 @@ module com.hedera.hashgraph.sdk.full { requires transitive com.google.protobuf; - requires com.google.common; requires com.google.gson; requires headlong; @@ -32,7 +31,6 @@ requires org.bouncycastle.pkix; requires org.bouncycastle.provider; requires org.slf4j; - requires static transitive java.annotation; exports com.hedera.hashgraph.sdk; diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index 1c6229fcce..bd68f22f0d 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,14 +12,23 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ plugins { - id("com.hedera.gradle.sdk") + id("com.hedera.gradle.module.library") + id("com.hedera.gradle.feature.protobuf") + id("com.hedera.gradle.feature.test-integration") } -// Define dependency constraints for gRPC implementations so that clients automatically get the correct version +description = "Hedera™ Hashgraph SDK for Java" + +javaModuleDependencies.moduleNameToGA.put( + "com.google.protobuf", + "com.google.protobuf:protobuf-javalite" +) + +// Define dependency constraints for gRPC implementations so that clients automatically get the +// correct version dependencies.constraints { api("io.grpc:grpc-netty:1.64.0") api("io.grpc:grpc-netty-shaded:1.64.0") @@ -30,6 +36,9 @@ dependencies.constraints { } testModuleInfo { + requires("com.fasterxml.jackson.annotation") + requires("com.fasterxml.jackson.core") + requires("com.fasterxml.jackson.databind") requires("json.snapshot") requires("org.assertj.core") requires("org.junit.jupiter.api") @@ -46,3 +55,36 @@ testIntegrationModuleInfo { runtimeOnly("io.grpc.netty.shaded") runtimeOnly("org.slf4j.simple") } + +protobuf { + generateProtoTasks { + all().configureEach { + builtins.named("java") { option("lite") } + plugins.named("grpc") { option("lite") } + } + } +} + +tasks.withType().configureEach { + systemProperty("CONFIG_FILE", providers.gradleProperty("CONFIG_FILE").getOrElse("")) + systemProperty("HEDERA_NETWORK", providers.gradleProperty("HEDERA_NETWORK").getOrElse("")) + systemProperty("OPERATOR_ID", providers.gradleProperty("OPERATOR_ID").getOrElse("")) + systemProperty("OPERATOR_KEY", providers.gradleProperty("OPERATOR_KEY").getOrElse("")) +} + +tasks.withType().configureEach { options.compilerArgs.add("-Xlint:-exports,-dep-ann") } + +dependencyAnalysis.abi { + exclusions { + // Exposes: org.slf4j.Logger + excludeClasses("logger") + // Exposes: com.google.common.base.MoreObjects.ToStringHelper + excludeClasses(".*\\.CustomFee") + // Exposes: com.esaulpaugh.headlong.abi.Tuple + excludeClasses(".*\\.ContractFunctionResult") + // Exposes: org.bouncycastle.crypto.params.KeyParameter + excludeClasses(".*\\.PrivateKey.*") + // Exposes: io.grpc.stub.AbstractFutureStub (and others) + excludeClasses(".*Grpc") + } +} diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/FileAppendTransaction.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/FileAppendTransaction.java index eaa87ba8de..b1448899f6 100644 --- a/sdk/src/main/java/com/hedera/hashgraph/sdk/FileAppendTransaction.java +++ b/sdk/src/main/java/com/hedera/hashgraph/sdk/FileAppendTransaction.java @@ -1,8 +1,5 @@ -/*- - * - * Hedera Java SDK - * - * Copyright (C) 2020 - 2024 Hedera Hashgraph, LLC +/* + * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ + package com.hedera.hashgraph.sdk; import com.google.protobuf.ByteString; @@ -28,10 +25,9 @@ import com.hedera.hashgraph.sdk.proto.TransactionID; import com.hedera.hashgraph.sdk.proto.TransactionResponse; import io.grpc.MethodDescriptor; - -import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Objects; +import javax.annotation.Nullable; /** *

A transaction specifically to append data to a file on the network. @@ -62,7 +58,9 @@ public FileAppendTransaction() { * records * @throws InvalidProtocolBufferException when there is an issue with the protobuf */ - FileAppendTransaction(LinkedHashMap> txs) throws InvalidProtocolBufferException { + FileAppendTransaction( + LinkedHashMap> txs) + throws InvalidProtocolBufferException { super(txs); initFromTransactionBody(); @@ -116,7 +114,7 @@ public ByteString getContents() { * * @param contents the contents to append to the file. * @return {@code this} - * @see #setContents(String) for an overload which takes {@link String}. + * @see #setContents(String) for an overload which takes String. */ public FileAppendTransaction setContents(byte[] contents) { return setData(contents); @@ -127,13 +125,12 @@ public FileAppendTransaction setContents(byte[] contents) { * * @param contents the contents to append to the file. * @return {@code this} - * @see #setContents(String) for an overload which takes {@link String}. + * @see #setContents(String) for an overload which takes String. */ public FileAppendTransaction setContents(ByteString contents) { return setData(contents); } - /** *

Encode the given {@link String} as UTF-8 and append it to file as identified by * {@link #setFileId(FileId)}. @@ -174,12 +171,13 @@ void initFromTransactionBody() { if (!innerSignedTransactions.isEmpty()) { try { - for (var i = 0; i < innerSignedTransactions.size(); - i += nodeAccountIds.isEmpty() ? 1 : nodeAccountIds.size()) { - data = data.concat( - TransactionBody.parseFrom(innerSignedTransactions.get(i).getBodyBytes()) - .getFileAppend().getContents() - ); + for (var i = 0; + i < innerSignedTransactions.size(); + i += nodeAccountIds.isEmpty() ? 1 : nodeAccountIds.size()) { + data = data.concat(TransactionBody.parseFrom( + innerSignedTransactions.get(i).getBodyBytes()) + .getFileAppend() + .getContents()); } } catch (InvalidProtocolBufferException exc) { throw new IllegalArgumentException(exc.getMessage()); @@ -205,7 +203,13 @@ FileAppendTransactionBody.Builder build() { } @Override - void onFreezeChunk(TransactionBody.Builder body, @Nullable TransactionID initialTransactionId, int startIndex, int endIndex, int chunk, int total) { + void onFreezeChunk( + TransactionBody.Builder body, + @Nullable TransactionID initialTransactionId, + int startIndex, + int endIndex, + int chunk, + int total) { body.setFileAppend(build().setContents(data.substring(startIndex, endIndex))); } diff --git a/sdk/src/main/java/module-info.java b/sdk/src/main/java/module-info.java index d9f19f2fe2..c9aca47776 100644 --- a/sdk/src/main/java/module-info.java +++ b/sdk/src/main/java/module-info.java @@ -20,7 +20,6 @@ module com.hedera.hashgraph.sdk { requires transitive com.google.protobuf; - requires com.google.common; requires com.google.gson; requires headlong; @@ -32,7 +31,6 @@ requires org.bouncycastle.pkix; requires org.bouncycastle.provider; requires org.slf4j; - requires static transitive java.annotation; exports com.hedera.hashgraph.sdk; diff --git a/sdk/src/testIntegration/java/module-info.java b/sdk/src/testIntegration/java/module-info.java index 90228b96c1..9773a6ba36 100644 --- a/sdk/src/testIntegration/java/module-info.java +++ b/sdk/src/testIntegration/java/module-info.java @@ -24,6 +24,5 @@ requires org.assertj.core; requires org.bouncycastle.provider; requires org.junit.jupiter.api; - requires static java.annotation; } diff --git a/settings.gradle.kts b/settings.gradle.kts index ecb9abf83e..fa7cafa2b1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +12,23 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ pluginManagement { - includeBuild("gradle/plugins") + repositories.gradlePluginPortal() + repositories.maven("https://repo.onepiece.software/snapshots") } -plugins { - id("com.hedera.gradle.settings") + +plugins { id("com.hedera.gradle.build") version "0.0.2" } + +rootProject.name = "hedera-sdk-java" + +javaModules { + module("sdk") { group = "com.hedera.hashgraph" } + module("sdk-full") { group = "com.hedera.hashgraph" } + module("tck") { group = "com.hedera.hashgraph.sdk.tck" } } includeBuild("examples") -includeBuild("example-android") -include("sdk") -include("sdk-full") -include("sdk-dependency-versions") -include("tck") +includeBuild("example-android") diff --git a/tck/build.gradle.kts b/tck/build.gradle.kts index 93068a4cfe..2cf7a05feb 100644 --- a/tck/build.gradle.kts +++ b/tck/build.gradle.kts @@ -1,7 +1,4 @@ -/*- - * - * Hedera Java SDK - * +/* * Copyright (C) 2024 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,56 +12,72 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ +import org.springframework.boot.gradle.plugin.ResolveMainClassName +import org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES + plugins { - id("java") - id("com.diffplug.spotless") version "6.25.0" id("org.springframework.boot") version "3.2.3" + id("java") + id("com.autonomousapps.dependency-analysis") + id("com.hedera.gradle.base.lifecycle") + id("com.hedera.gradle.check.javac-lint") + id("com.hedera.gradle.check.spotless") + id("com.hedera.gradle.check.spotless-java") + id("com.hedera.gradle.check.spotless-kotlin") + id("com.hedera.gradle.feature.git-properties-file") + id("com.hedera.gradle.feature.java-compile") + id("com.hedera.gradle.feature.java-doc") + id("com.hedera.gradle.feature.java-execute") + id("com.hedera.gradle.feature.test") + id("com.hedera.gradle.report.test-logger") } description = "Hedera SDK TCK Server" -group = "com.hedera.hashgraph.sdk.tck" -version = "0.0.1" -java { - sourceCompatibility = JavaVersion.VERSION_17 -} - -repositories { - mavenCentral() -} +version = "0.0.1" dependencies { - implementation(platform("org.springframework.boot:spring-boot-dependencies:3.2.3")) - implementation(platform(project(":sdk-dependency-versions"))) + annotationProcessor(platform(BOM_COORDINATES)) + annotationProcessor("org.projectlombok:lombok") - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("com.thetransactioncompany:jsonrpc2-server:2.0") - implementation("io.grpc:grpc-netty-shaded:1.57.2") - implementation("org.bouncycastle:bcpkix-jdk18on:1.78.1") - implementation("org.bouncycastle:bcprov-jdk18on:1.78.1") + implementation(platform(BOM_COORDINATES)) + implementation(platform(project(":hedera-dependency-versions"))) implementation(project(":sdk")) - compileOnly("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.30") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") - testImplementation("org.mockito:mockito-core:3.11.2") - testImplementation("org.mockito:mockito-junit-jupiter:5.11.0") + implementation("com.thetransactioncompany:jsonrpc2-base") + implementation("com.thetransactioncompany:jsonrpc2-server:2.0") + implementation("net.minidev:json-smart") + implementation("org.apache.tomcat.embed:tomcat-embed-core") + implementation("org.bouncycastle:bcprov-jdk18on") + implementation("org.slf4j:slf4j-api") + implementation("org.springframework.boot:spring-boot") + implementation("org.springframework.boot:spring-boot-autoconfigure") + implementation("org.springframework:spring-context") + implementation("org.springframework:spring-web") + implementation("org.springframework:spring-webmvc") + runtimeOnly("io.grpc:grpc-netty-shaded") + runtimeOnly("org.springframework.boot:spring-boot-starter-web") + compileOnly("org.projectlombok:lombok") + + testImplementation("org.junit.jupiter:junit-jupiter-api") + testImplementation("org.mockito:mockito-core") + testImplementation("org.mockito:mockito-junit-jupiter") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } -spotless { - java { - endWithNewline() - palantirJavaFormat() - target("**/*.java") - toggleOffOn() - } -} +tasks.withType { setGroup(null) } + +// Configure dependency analysis without using Java Modules +tasks.qualityGate { dependsOn(tasks.named("projectHealth")) } -tasks.test { - // discover and execute JUnit5-based tests - useJUnitPlatform() +tasks.qualityCheck { dependsOn(tasks.named("projectHealth")) } + +dependencyAnalysis { + issues { + onAny { + severity("fail") + exclude("com.google.protobuf:protobuf-javalite") + } + } }