Skip to content

Commit 21bbcda

Browse files
committed
Remove duplicated package-infos in the client sourceset
1 parent f0768fa commit 21bbcda

File tree

24 files changed

+24
-657
lines changed

24 files changed

+24
-657
lines changed

build.gradle

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -269,31 +269,42 @@ import java.util.regex.Matcher
269269
abstract class GeneratePackageInfos extends DefaultTask {
270270
@InputFiles
271271
@PathSensitive(PathSensitivity.RELATIVE)
272-
abstract ConfigurableFileCollection getFiles();
272+
abstract DirectoryProperty getClientSources();
273+
274+
275+
@InputFiles
276+
@PathSensitive(PathSensitivity.RELATIVE)
277+
abstract DirectoryProperty getMainSources();
273278

274279
@TaskAction
275280
void generatePackageInfos() {
276-
getFiles().each { javaFile ->
277-
def packageInfoFile = new File(javaFile.parent, 'package-info.java')
278-
if (!packageInfoFile.exists()) {
281+
def existingPackages = new HashSet<String>()
282+
for (def tree in [mainSources.asFileTree, clientSources.asFileTree]) {
283+
tree.each { javaFile ->
284+
def packageInfoFile = new File(javaFile.parent, 'package-info.java')
285+
279286
def pkgName = javaFile.toString().replaceAll(Matcher.quoteReplacement(File.separator), '/')
280287
pkgName = pkgName.substring(pkgName.indexOf('aztech/modern_industrialization/'), pkgName.lastIndexOf('/'))
281288
pkgName = pkgName.replaceAll('/', '.')
282289

283-
def pkgInfoText = """
284-
|@NullMarked
285-
|package $pkgName;
286-
|
287-
|import org.jspecify.annotations.NullMarked;
288-
""".stripMargin().trim()
289-
290-
packageInfoFile.text = pkgInfoText
290+
if (!packageInfoFile.exists() && !existingPackages.contains(pkgName)) {
291+
def pkgInfoText = """
292+
|@NullMarked
293+
|package $pkgName;
294+
|
295+
|import org.jspecify.annotations.NullMarked;
296+
""".stripMargin().trim()
297+
298+
packageInfoFile.text = pkgInfoText
299+
}
300+
existingPackages.add(pkgName)
291301
}
292302
}
293303
}
294304
}
295305
final generatePackageInfos = tasks.register('generatePackageInfos', GeneratePackageInfos) {
296-
it.files.from fileTree("src/client/java"), fileTree("src/main/java")
306+
it.clientSources = file("src/client/java")
307+
it.mainSources = file("src/main/java")
297308
}
298309

299310
immaculate {

src/client/java/aztech/modern_industrialization/blocks/forgehammer/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/blocks/storage/barrel/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/blocks/storage/tank/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/compat/ae2/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/datagen/model/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/datagen/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/items/armor/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/items/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/client/java/aztech/modern_industrialization/machines/gui/package-info.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)