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: bump hiero-gradle-conventions to 0.3.4 / correct requires static #17876

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 2 additions & 17 deletions hapi/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
module com.hedera.node.hapi {
exports com.hedera.hapi.node.base;
exports com.hedera.hapi.node.base.codec;
Expand Down Expand Up @@ -99,5 +84,5 @@
requires transitive io.grpc;
requires io.grpc.protobuf;
requires org.antlr.antlr4.runtime;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
3 changes: 2 additions & 1 deletion hapi/src/testFixtures/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.hapi.test.fixtures {
exports com.hedera.node.hapi.fixtures;

requires transitive com.hedera.node.hapi;
requires transitive com.hedera.pbj.runtime;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
3 changes: 2 additions & 1 deletion hedera-node/hapi-fees/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.app.hapi.fees {
exports com.hedera.node.app.hapi.fees.pricing;
exports com.hedera.node.app.hapi.fees.usage.crypto;
Expand All @@ -24,5 +25,5 @@
requires com.fasterxml.jackson.databind;
requires org.apache.commons.lang3;
requires org.apache.logging.log4j;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
3 changes: 2 additions & 1 deletion hedera-node/hapi-utils/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.app.hapi.utils {
exports com.hedera.node.app.hapi.utils.fee;
exports com.hedera.node.app.hapi.utils.forensics;
Expand Down Expand Up @@ -37,5 +38,5 @@
requires org.apache.logging.log4j;
requires org.bouncycastle.pkix;
requires org.bouncycastle.provider;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
18 changes: 1 addition & 17 deletions hedera-node/hedera-addressbook-service-impl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
plugins { id("org.hiero.gradle.module.library") }

description = "Default Hedera AddressBook Service Implementation"
Expand All @@ -32,5 +17,4 @@ testModuleInfo {
requires("org.junit.jupiter.api")
requires("org.mockito")
requires("org.mockito.junit.jupiter")
requiresStatic("com.github.spotbugs.annotations")
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
import com.hedera.node.app.service.addressbook.impl.AddressBookServiceImpl;

module com.hedera.node.app.service.addressbook.impl {
Expand All @@ -33,8 +18,8 @@
requires com.swirlds.platform.core;
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
requires static transitive com.github.spotbugs.annotations;
requires static transitive java.compiler;
requires static com.github.spotbugs.annotations;

provides com.hedera.node.app.service.addressbook.AddressBookService with
AddressBookServiceImpl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.app.service.addressbook {
exports com.hedera.node.app.service.addressbook;

Expand All @@ -10,5 +11,5 @@
requires com.swirlds.config.api;
requires org.bouncycastle.pkix;
requires org.bouncycastle.provider;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
18 changes: 1 addition & 17 deletions hedera-node/hedera-app-spi/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
plugins {
id("org.hiero.gradle.module.library")
id("org.hiero.gradle.feature.test-fixtures")
Expand All @@ -30,5 +15,4 @@ testModuleInfo {
requires("org.junit.jupiter.params")
requires("org.mockito")
requires("org.mockito.junit.jupiter")
requiresStatic("com.github.spotbugs.annotations")
}
5 changes: 3 additions & 2 deletions hedera-node/hedera-app-spi/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.app.spi {
requires transitive com.hedera.node.app.hapi.utils;
requires transitive com.hedera.node.hapi;
requires transitive com.hedera.pbj.runtime;
requires transitive com.swirlds.common;
requires transitive com.swirlds.config.api;
requires transitive com.swirlds.metrics.api;
requires transitive com.swirlds.state.api;
requires transitive com.hedera.pbj.runtime;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;

exports com.hedera.node.app.spi;
exports com.hedera.node.app.spi.fees;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.app.spi.test.fixtures {
exports com.hedera.node.app.spi.fixtures;
exports com.hedera.node.app.spi.fixtures.workflows;
Expand All @@ -7,17 +8,17 @@
requires transitive com.hedera.node.app.service.token; // TMP until FakePreHandleContext can be removed
requires transitive com.hedera.node.app.spi;
requires transitive com.hedera.node.hapi;
requires transitive com.hedera.pbj.runtime;
requires transitive com.swirlds.config.api;
requires transitive com.swirlds.state.api.test.fixtures;
requires transitive com.swirlds.state.api;
requires transitive com.swirlds.state.impl.test.fixtures;
requires transitive com.hedera.pbj.runtime;
requires transitive org.apache.logging.log4j;
requires transitive org.assertj.core;
requires transitive org.junit.jupiter.api;
requires com.hedera.node.app.hapi.utils;
requires com.swirlds.common;
requires com.swirlds.platform.core;
requires org.apache.logging.log4j.core;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
18 changes: 1 addition & 17 deletions hedera-node/hedera-app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
plugins {
id("org.hiero.gradle.module.library")
id("org.hiero.gradle.feature.benchmark")
Expand Down Expand Up @@ -58,7 +43,6 @@ testModuleInfo {
requires("tuweni.bytes")
requires("uk.org.webcompere.systemstubs.core")
requires("uk.org.webcompere.systemstubs.jupiter")
requiresStatic("com.github.spotbugs.annotations")
}

jmhModuleInfo {
Expand Down
19 changes: 2 additions & 17 deletions hedera-node/hedera-app/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
import com.hedera.node.app.config.ServicesConfigExtension;
import com.swirlds.config.api.ConfigurationExtension;

Expand Down Expand Up @@ -68,7 +53,7 @@
requires io.netty.transport.classes.epoll;
requires io.netty.transport;
requires org.apache.commons.lang3;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
requires static com.google.auto.service;
requires static java.compiler; // javax.annotation.processing.Generated

Expand Down
19 changes: 2 additions & 17 deletions hedera-node/hedera-app/src/testFixtures/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
module com.hedera.node.app.test.fixtures {
exports com.hedera.node.app.fixtures.state;

Expand All @@ -38,5 +23,5 @@
requires com.swirlds.state.impl.test.fixtures;
requires org.apache.logging.log4j;
requires org.assertj.core;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
1 change: 0 additions & 1 deletion hedera-node/hedera-config/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ testModuleInfo {
requires("org.assertj.core")
requires("org.junit.jupiter.api")
requires("org.junit.jupiter.params")
requiresStatic("com.github.spotbugs.annotations")
}
5 changes: 3 additions & 2 deletions hedera-node/hedera-config/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.config {
exports com.hedera.node.config;
exports com.hedera.node.config.converter;
Expand All @@ -8,11 +9,11 @@

requires transitive com.hedera.node.app.hapi.utils;
requires transitive com.hedera.node.hapi;
requires transitive com.hedera.pbj.runtime;
requires transitive com.swirlds.config.api;
requires transitive com.swirlds.config.extensions;
requires transitive com.hedera.pbj.runtime;
requires com.swirlds.common;
requires org.apache.commons.lang3;
requires org.apache.logging.log4j;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
module com.hedera.node.config.test.fixtures {
exports com.hedera.node.config.testfixtures;

Expand All @@ -10,5 +11,5 @@
requires com.swirlds.merkledb;
requires com.swirlds.platform.core;
requires com.swirlds.virtualmap;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
18 changes: 1 addition & 17 deletions hedera-node/hedera-consensus-service-impl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2024-2025 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
plugins { id("org.hiero.gradle.module.library") }

description = "Default Hedera Consensus Service Implementation"
Expand All @@ -31,5 +16,4 @@ testModuleInfo {
requires("org.junit.jupiter.api")
requires("org.mockito")
requires("org.mockito.junit.jupiter")
requiresStatic("com.github.spotbugs.annotations")
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/*
* Copyright (C) 2025 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
import com.hedera.node.app.service.consensus.impl.ConsensusServiceImpl;

/**
Expand All @@ -35,7 +20,7 @@
requires com.swirlds.config.api;
requires com.google.common;
requires org.apache.logging.log4j;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;

provides com.hedera.node.app.service.consensus.ConsensusService with
ConsensusServiceImpl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
/**
* Provides the classes necessary to manage Hedera Consensus Service.
*/
Expand All @@ -10,5 +11,5 @@
requires transitive com.hedera.node.hapi;
requires transitive com.hedera.pbj.runtime;
requires com.hedera.node.app.hapi.utils;
requires static com.github.spotbugs.annotations;
requires static transitive com.github.spotbugs.annotations;
}
1 change: 0 additions & 1 deletion hedera-node/hedera-file-service-impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ testModuleInfo {
requires("org.junit.jupiter.api")
requires("org.mockito")
requires("org.mockito.junit.jupiter")
requiresStatic("com.github.spotbugs.annotations")
}
Loading
Loading