From 2bb5f2ba7c451161be97ba8b800d2bd471ae7e47 Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Tue, 26 Sep 2023 17:21:14 +0100 Subject: [PATCH] updates based on feedback from Jendrick on hedera-services changes. Signed-off-by: Jeromy Cannon --- .../com.hedera.fullstack.root.gradle.kts | 23 +++++++++++++++++++ .../com.hedera.fullstack.umbrella.gradle.kts | 7 ------ build.gradle.kts | 2 +- fullstack-examples/build.gradle.kts | 5 ++-- settings.gradle.kts | 4 ++-- 5 files changed, 29 insertions(+), 12 deletions(-) delete mode 100644 build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.umbrella.gradle.kts diff --git a/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.root.gradle.kts b/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.root.gradle.kts index e69de29bb..c85cda355 100644 --- a/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.root.gradle.kts +++ b/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.root.gradle.kts @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Hedera Hashgraph, LLC + * + * This software is the confidential and proprietary information of + * Hedera Hashgraph, LLC. ("Confidential Information"). You shall not + * disclose such Confidential Information and shall use it only in + * accordance with the terms of the license agreement you entered into + * with Hedera Hashgraph. + * + * HEDERA HASHGRAPH MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF + * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED + * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. HEDERA HASHGRAPH SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. + */ + +plugins { + id("com.autonomousapps.dependency-analysis") + id("com.hedera.fullstack.aggregate-reports") + id("com.hedera.fullstack.spotless-conventions") + id("com.hedera.fullstack.spotless-kotlin-conventions") +} diff --git a/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.umbrella.gradle.kts b/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.umbrella.gradle.kts deleted file mode 100644 index 9ee7a6707..000000000 --- a/build-logic/project-plugins/src/main/kotlin/com.hedera.fullstack.umbrella.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ - -plugins { - id("com.autonomousapps.dependency-analysis") - id("com.hedera.fullstack.aggregate-reports") - id("com.hedera.fullstack.spotless-conventions") - id("com.hedera.fullstack.spotless-kotlin-conventions") -} diff --git a/build.gradle.kts b/build.gradle.kts index c50450172..cecc1f3ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("com.hedera.fullstack.umbrella") } +plugins { id("com.hedera.fullstack.root") } repositories { // mavenLocal() // uncomment to use local maven repository diff --git a/fullstack-examples/build.gradle.kts b/fullstack-examples/build.gradle.kts index 7710eb6a0..4eabfe398 100644 --- a/fullstack-examples/build.gradle.kts +++ b/fullstack-examples/build.gradle.kts @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import com.hedera.fullstack.gradle.plugin.HelmInstallChartTask plugins { id("java") - id("com.hedera.fullstack.umbrella") + id("com.hedera.fullstack.root") id("com.hedera.fullstack.conventions") id("com.hedera.fullstack.jpms-modules") id("com.hedera.fullstack.fullstack-gradle-plugin") @@ -50,4 +51,4 @@ tasks.register("helmInstallNginxChart") { tasks.check { dependsOn("helmInstallNginxChart") // TODO: depends on helmUninstallNginxChart -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 8f61172e2..bdaa1997b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,8 +48,8 @@ include(":fullstack-datasource-api") include(":fullstack-datasource-core") -// TODO: re-enable once we have a way to run the fullstack-examples without IntelliJ and Sonar issues -//includeBuild("fullstack-examples") +// TODO: re-enable once we have a way to run the *-examples without IntelliJ and Sonar issues +// includeBuild("fullstack-examples") include(":fullstack-gradle-plugin")