Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: use common Hiero Gradle config #15282

Merged
merged 22 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2f247e2
build: use plugins from 'hedera-gradle-conventions'
jjohannes Aug 27, 2024
c4d5a88
chore: hedera -> hiero
jjohannes Nov 4, 2024
b4d307a
build: adjust ids after rebase
jjohannes Nov 23, 2024
0751164
build: update license headers
jjohannes Nov 23, 2024
eb13c2b
build: hedera -> hiero
jjohannes Nov 23, 2024
8e75d1c
build: headlong -> com.esaulpaugh.headlong;
jjohannes Nov 23, 2024
46cf830
build: use official release of 'org.hiero.gradle.build'
jjohannes Nov 23, 2024
e891536
build: adjustments after rebase
jjohannes Dec 9, 2024
672abbd
build: reintegrate changes from #16173 and make the setup lazy
jjohannes Dec 9, 2024
acb5b03
chore: formatting
jjohannes Dec 9, 2024
4c7cfb3
chore: move doc changes out
jjohannes Dec 9, 2024
d295813
chore: remove unused file
jjohannes Dec 9, 2024
4f8c829
chore: update org.hiero.gradle.build to 0.1.1
jjohannes Dec 11, 2024
c4d8da3
Update hapi/build.gradle.kts
jjohannes Dec 12, 2024
a221d38
chore: restore still valid comment
jjohannes Dec 12, 2024
e3ba28a
Update gradle/aggregation/build.gradle.kts
jjohannes Dec 12, 2024
2af58f6
Merge branch 'develop' into 14255-reusable-gradle-config
jjohannes Dec 12, 2024
9932b92
chore: formatting
jjohannes Dec 12, 2024
a8f9b22
Merge branch 'develop' into 14255-reusable-gradle-config
jjohannes Dec 12, 2024
40e196a
Merge branch 'develop' into 14255-reusable-gradle-config
jjohannes Dec 12, 2024
1aac63f
Merge branch 'develop' into 14255-reusable-gradle-config
jjohannes Dec 17, 2024
9239739
ci: remove '/gradle/plugins' from Dependabot config
jjohannes Dec 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
version: 2
updates:
- package-ecosystem: "gradle"
directory: "/hedera-dependency-versions"
schedule:
interval: "daily"
open-pull-requests-limit: 10
- package-ecosystem: "gradle"
directory: "/gradle/plugins"
directory: "/hiero-dependency-versions"
schedule:
interval: "daily"
open-pull-requests-limit: 10
Expand Down
17 changes: 1 addition & 16 deletions .github/workflows/node-zxc-build-release-artifact.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
##
# Copyright (C) 2022-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.
##

# SPDX-License-Identifier: Apache-2.0
name: "ZXC: [Node] Deploy Release Artifacts"
on:
workflow_call:
Expand Down
17 changes: 1 addition & 16 deletions .github/workflows/zxc-publish-production-image.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
##
# 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.
##

# SPDX-License-Identifier: Apache-2.0
name: "ZXC: Publish Production Image"
on:
workflow_call:
Expand Down
24 changes: 3 additions & 21 deletions example-apps/swirlds-platform-base-example/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
/*
* Copyright (C) 2020-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.platform")
}
// SPDX-License-Identifier: Apache-2.0
plugins { id("org.hiero.gradle.module.application") }

mainModuleInfo {
annotationProcessor("com.swirlds.config.processor")
annotationProcessor("com.google.auto.service.processor")
runtimeOnly("com.swirlds.config.impl")
}

application.mainClass.set("com.swirlds.platform.base.example.Application")
application.mainClass = "com.swirlds.platform.base.example.Application"
51 changes: 29 additions & 22 deletions gradle/aggregation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
/*
* 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.reports") }
// SPDX-License-Identifier: Apache-2.0
plugins {
id("org.hiero.gradle.base.lifecycle")
id("org.hiero.gradle.report.code-coverage")
id("org.hiero.gradle.check.spotless")
id("org.hiero.gradle.check.spotless-kotlin")
}

dependencies {
implementation(project(":app"))
Expand All @@ -29,9 +19,26 @@ dependencies {
implementation(project(":test-clients"))
}

tasks.named<JacocoReport>("testCodeCoverageReport") {
val exclusions = listOf("test-clients", "testFixtures", "statedumpers", "example-apps")
classDirectories.setFrom(
classDirectories.files.filterNot { file -> exclusions.any { file.path.contains(it) } }
)
tasks.testCodeCoverageReport {
// Redo the setup done in 'JacocoReportAggregationPlugin', but gather the class files in the
// file tree and filter out selected classes by path.
val filteredClassFiles =
configurations.aggregateCodeCoverageReportResults
.get()
.incoming
.artifactView {
componentFilter { id -> id is ProjectComponentIdentifier }
attributes.attribute(
LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
objects.named(LibraryElements.CLASSES)
)
}
.files
.asFileTree
.filter { file ->
listOf("test-clients", "testFixtures", "statedumpers", "example-apps").none {
file.path.contains(it)
}
}
classDirectories.setFrom(filteredClassFiles)
}
1 change: 1 addition & 0 deletions gradle/development-branch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
develop
42 changes: 0 additions & 42 deletions gradle/plugins/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading