-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
443 changed files
with
8,694 additions
and
4,251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,5 +20,3 @@ plugins { | |
| } | ||
|
|
||
| group = "com.hedera.storage" | ||
|
|
||
| tasks.checkModuleInfo { moduleNamePrefix = "com.hedera.storage" } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
gradle/plugins/src/main/kotlin/com/hedera/gradle/services/TaskLockService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/SortModuleInfoRequiresStep.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package com.hedera.gradle.spotless | ||
|
|
||
| import com.diffplug.spotless.FormatterFunc | ||
| import com.diffplug.spotless.FormatterStep | ||
|
|
||
| class SortModuleInfoRequiresStep { | ||
| companion object { | ||
| private const val NAME = "SortModuleInfoRequires" | ||
| private val OWN_PACKAGES = listOf("com.swirlds.", "com.hedera.node.", "com.hedera.storage.") | ||
|
|
||
| fun create(): FormatterStep { | ||
| return FormatterStep.create(NAME, State(), State::toFormatter) | ||
| } | ||
| } | ||
|
|
||
| private class State : java.io.Serializable { | ||
|
|
||
| fun toFormatter(): FormatterFunc { | ||
| return FormatterFunc { unixStr -> | ||
| val lines = unixStr.split('\n') | ||
| val blockStartIndex = lines.indexOfFirst { it.trim().startsWith("requires") } | ||
| val blockEndIndex = lines.indexOfLast { it.trim().startsWith("requires") } | ||
|
|
||
| if (blockStartIndex == -1) { | ||
| unixStr // not a module-info.java or no 'requires' | ||
| } else { | ||
| val nonRequiresLines = mutableListOf<String>() | ||
|
|
||
| val requiresTransitive = mutableListOf<String>() | ||
| val requires = mutableListOf<String>() | ||
| val requiresStaticTransitive = mutableListOf<String>() | ||
| val requiresStatic = mutableListOf<String>() | ||
|
|
||
| lines.subList(blockStartIndex, blockEndIndex + 1).forEach { line -> | ||
| when { | ||
| line.trim().startsWith("requires static transitive") -> | ||
| requiresStaticTransitive.add(line) | ||
| line.trim().startsWith("requires static") -> requiresStatic.add(line) | ||
| line.trim().startsWith("requires transitive") -> | ||
| requiresTransitive.add(line) | ||
| line.trim().startsWith("requires") -> requires.add(line) | ||
| line.isNotBlank() && !line.trim().startsWith("requires") -> | ||
| nonRequiresLines.add(line) | ||
| } | ||
| } | ||
|
|
||
| val comparator = | ||
| Comparator<String> { a, b -> | ||
| val nameA = a.split(" ").first { it.endsWith(";") } | ||
| val nameB = b.split(" ").first { it.endsWith(";") } | ||
| if ( | ||
| OWN_PACKAGES.any { nameA.startsWith(it) } && | ||
| OWN_PACKAGES.none { nameB.startsWith(it) } | ||
| ) { | ||
| -1 | ||
| } else if ( | ||
| OWN_PACKAGES.none { nameA.startsWith(it) } && | ||
| OWN_PACKAGES.any { nameB.startsWith(it) } | ||
| ) { | ||
| 1 | ||
| } else { | ||
| nameA.compareTo(nameB) | ||
| } | ||
| } | ||
|
|
||
| requiresTransitive.sortWith(comparator) | ||
| requires.sortWith(comparator) | ||
| requiresStaticTransitive.sortWith(comparator) | ||
| requiresStatic.sortWith(comparator) | ||
|
|
||
| val blockStart = lines.subList(0, blockStartIndex) | ||
| val blockEnd = lines.subList(blockEndIndex + 1, lines.size) | ||
|
|
||
| (blockStart + | ||
| nonRequiresLines + | ||
| requiresTransitive + | ||
| requires + | ||
| requiresStaticTransitive + | ||
| requiresStatic + | ||
| blockEnd) | ||
| .joinToString("\n") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.