Skip to content

Commit ff2a8c5

Browse files
Update plugin org.gradlex.internal-build-conventions to v0.9 (#225)
* Update plugin org.gradlex.internal-build-conventions to v0.9 * Changed expected opensource@palantir.com signing key * Remove 'package-info.java' files and cleanup annotations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jendrik Johannes <jendrik@onepiece.software>
1 parent 11c489e commit ff2a8c5

17 files changed

+69
-54
lines changed

gradle/verification-keyring.keys

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,46 +1274,48 @@ LBaslDFjyxMECWr3v7TuEmEmNcD+KwNyACFNuBjEBWeuJZYwCkAkVy8AyitrTMh8
12741274
=Evfn
12751275
-----END PGP PUBLIC KEY BLOCK-----
12761276

1277-
id 1D9866E375A1435ACE0BE0ADE3461D2D16725F94
1277+
id BF3A87D91B70BE32CAD64A2645D0CAA6D26B0F7D
12781278
uid Open Source <opensource@palantir.com>
12791279
-----BEGIN PGP PUBLIC KEY BLOCK-----
12801280

1281-
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
1316-
=rjU5
1281+
xsFNBGO20jEBEADDfG4vnhaVJ35Nn55d87eOPv3+3yWV+aR7TWQMGfOl8N32tNlV
1282+
rFn8x8aks7jXzW66EOeDZKDjM2X259p/eDyXDDRE+4Ade5KzKKFuKMYcO7hHcjk1
1283+
m9fVpEBE1eg73VetWGb4MfauFbWYKKBniBYzKyLMokQ8gl/wUC0hVAzGPCXSo+9r
1284+
1tobq2K2OS9SRUhEVYkzrdkPINfxyY7/SkKtzhoPqv1ICIOJHb5NQmhU3YDbHQAL
1285+
oAaWON+sd+kkgbvFesgQK14PuFocDdlatI778PA6gT6ah6zRvl4654Ypsx9gF8DT
1286+
PkkFZtwx/vb/89MZ7GykF2XH+TC1hMBQ2HW0QVCVVE0ah2rQQ7OqcOkCMHWFTMEV
1287+
/4iEeRKX11q3AzC5xcA4EFJLe4Aoe7F+uyuut8ey7Iy0GdBldTOzM4jEFdMj23q/
1288+
aqUUmrz1JbNnAtG3pfcfUuJ1nAaylcQ5Q8g7i9434eZhEeYndPiq1zr0Oo331zYh
1289+
JeNY3Y+Pg+TE6uwizgjaPW96Zcdqv6wzB+DWOfU6Mozs57569cDTC8p/lb6M/0Pz
1290+
5IudFyyRaKoqsHjhBUxMG/sbjBxv6leZ05020a5AZpBAqLwRjCPnL6F4QOIllyoe
1291+
G+WauXxsNZ5w8NpJIEjZ0PrYoTe60SRrwwQa8mF9fC/eBapd1SFcBud6WQARAQAB
1292+
zSVPcGVuIFNvdXJjZSA8b3BlbnNvdXJjZUBwYWxhbnRpci5jb20+wsGPBBMBCgA5
1293+
AhsDAgsJAxUKCAUWAgMBAAIeAQIXgBYhBL86h9kbcL4yytZKJkXQyqbSaw99BQJo
1294+
y0JyBQkKuArBAAoJEEXQyqbSaw99xmIP/iqC3V7FfbXPr4BfeEffc6BwBnmqmcla
1295+
xGHiQ/xLXOwkuTUYvqxnEvcevpKklpFj/tWILiYNzV0ZcCKQ5e1pgIYTW3KbNool
1296+
iNlVez74+LKYuQNK9m6536yY6n5VV8eI2v/O3HjQGY8WQa6JgpremCxCupV6KbqX
1297+
IMGandR+X5kQtRFV9/8LUfEfnLoc20/AmvGDChFvc9Su4VH73xt1IEIJie6A+q5Z
1298+
EFWlByDbng4FU5NiYJdLYhJLF74qp1GrNZe+jNEsLYYp0IEPNJYgzFZJPh+NKDfB
1299+
FYjqrm2ynQdTdrHoe19ecPGXx7GAyfy/ztXUYrEUIhclZTgGMiLR/mFFZtXrGuKh
1300+
dDO8ZMVNeGKfoDpdkofCZ+zK8wAiNzO2OWnZzrTsNh3LoWDYVK0hDE2E+hEUEvXg
1301+
dOfQLQQSTaSIPGtG7k97XZsoSZgavbGIbCj4u4lXBqTfw+S0Z2MzMLxhzpTrMLfo
1302+
lRprjDE1aU3SoF+GhcKMYTioH3mzRD8iyhSSsJvWBp2WyiBBAw1fi/T15WFfeDxo
1303+
ppuRjEmWFb4LkOL0jYOwMyrTkAZEt+Y50U9/yivF+ZoMOLUcAH+0wfCINQ0tjiIE
1304+
lmpIYcxgrywOR62AL42sWJlZ2+m/887wjqHKr/9LTKoKtCypyKiHYrWHR67EMqdo
1305+
fQbrqP8uxdO1wsGPBBMBCgA5FiEEvzqH2RtwvjLK1komRdDKptJrD30FAmO20jEC
1306+
GwMFCQPCZwACCwkDFQoIBRYCAwEAAh4BAheAAAoJEEXQyqbSaw99i5EQAIgl492s
1307+
vph6Wv7o2Z71TTF7tTdTeQ1becAiCIggwy+io8V2MV+pi6rdkbWYnrgrerUkB1od
1308+
Y90LItcqHkPFgw7lu7pPOrI7LO5V+WTXWoQovVvb3E/X/gIgddUDPbNeLqEh2X3W
1309+
R0WiLnZOsz+kfCR0MoXvYakfme77nV8rzPshT/81l7l0btJk9v4ZHor/431HbTc1
1310+
BZC27l4NdCaZ4LIzvFkmGWmn44D691LCPYDuv1tmviLu9GkG7bV+xxbZ5USL82C8
1311+
DOb4ESf51mBy6kC0+RWyq+Fw7cRLdKbA2nwBNZ4DK7ctvhrmtDkfVhVLmYo++P59
1312+
jmxIpdkXEfXErEAX233VhDTUHgo6o5iCKGLq2/4TtttF4gw63sVFSt35plVQlqO1
1313+
0SQdg6ILI9pt2MNZI4leyP0o8fIRWLpOYPkwsesP8i8OjZde9XKQHwQmHJi2Vbc1
1314+
pgBMkSSXfETdcduetkWXLvnnHa6CBVB/p36aKvyrHpoaMsx5oNOIOhIo4WvJ+T8v
1315+
bmQ04P21CE6Z3bLLi/zbtP9e9uFoMbyGrt8rEqeNvpsqHTR0v0+ALOa4/CC3iJSe
1316+
M/iRTVSIzYQGT05pVwUlRrPSsVKLkzQPaRAjkE9fQ6LDpWrYgF0/8x1Q4sg/p/xJ
1317+
Q+QSti9Qi4JDuwzJy3IV/5dmHoPgvVs1EXvJ
1318+
=XaeA
13171319
-----END PGP PUBLIC KEY BLOCK-----
13181320

13191321
id BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE

gradle/verification-metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121

122122
<!-- CODE FORMATTING - Palantir Java formatter with transitive dependencies -->
123123
<!-- ✅ Signed by Palantir -->
124-
<trusted-key id="1D9866E375A1435ACE0BE0ADE3461D2D16725F94" group="com.palantir.javaformat"/>
124+
<trusted-key id="BF3A87D91B70BE32CAD64A2645D0CAA6D26B0F7D" group="com.palantir.javaformat"/>
125125
<!-- ✅ Signed by Tatu Saloranta - Jackson -->
126126
<trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181">
127127
<trusting group="com.fasterxml.jackson.core"/>

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
plugins { id("org.gradlex.internal-build-conventions") version "0.8" }
1+
plugins { id("org.gradlex.internal-build-conventions") version "0.9" }
22

33
rootProject.name = "extra-java-module-info"

src/main/java/org/gradlex/javamodule/moduleinfo/AutomaticModuleName.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package org.gradlex.javamodule.moduleinfo;
33

4+
import org.jspecify.annotations.NullMarked;
5+
6+
@NullMarked
47
public class AutomaticModuleName extends ModuleSpec {
58

69
AutomaticModuleName(String identifier, String moduleName) {

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@
4242
import org.gradle.api.tasks.SourceSetContainer;
4343
import org.gradle.util.GradleVersion;
4444
import org.gradlex.javamodule.moduleinfo.tasks.ModuleDescriptorRecommendation;
45+
import org.jspecify.annotations.NullMarked;
4546

4647
/**
4748
* Entry point of the plugin.
4849
*/
50+
@NullMarked
4951
public abstract class ExtraJavaModuleInfoPlugin implements Plugin<Project> {
5052

5153
private static final GradleVersion MINIMUM_SUPPORTED_VERSION = GradleVersion.version("6.8");

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPluginExtension.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
import org.gradle.api.provider.Property;
1515
import org.gradle.api.provider.Provider;
1616
import org.gradle.api.tasks.SourceSet;
17+
import org.jspecify.annotations.NullMarked;
1718

1819
/**
1920
* A data class to collect all the module information we want to add.
2021
* Here the class is used as extension that can be configured in the build script
2122
* and as input to the ExtraModuleInfoTransform that add the information to Jars.
2223
*/
23-
@SuppressWarnings("unused")
24+
@NullMarked
2425
public abstract class ExtraJavaModuleInfoPluginExtension {
25-
static Attribute<Boolean> JAVA_MODULE_ATTRIBUTE = Attribute.of("javaModule", Boolean.class);
26+
static final Attribute<Boolean> JAVA_MODULE_ATTRIBUTE = Attribute.of("javaModule", Boolean.class);
2627

2728
@Inject
2829
protected abstract ObjectFactory getObjects();

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.gradle.api.tasks.Classpath;
5757
import org.gradle.api.tasks.Input;
5858
import org.gradle.api.tasks.InputFiles;
59+
import org.jspecify.annotations.NullMarked;
5960
import org.objectweb.asm.ClassReader;
6061
import org.objectweb.asm.ClassVisitor;
6162
import org.objectweb.asm.ClassWriter;
@@ -67,6 +68,7 @@
6768
* The transformation fails the build if a Jar does not contain information and no extra information
6869
* was defined for it. This way we make sure that all Jars are turned into modules.
6970
*/
71+
@NullMarked
7072
@CacheableTransform
7173
public abstract class ExtraJavaModuleInfoTransform implements TransformAction<ExtraJavaModuleInfoTransform.Parameter> {
7274

src/main/java/org/gradlex/javamodule/moduleinfo/FilePathToModuleCoordinates.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import java.util.stream.Collectors;
66
import java.util.stream.StreamSupport;
77
import javax.annotation.Nullable;
8+
import org.jspecify.annotations.NullMarked;
89

910
/**
1011
* Attempts to parse 'group', 'name', 'version' coordinates from a paths like:
1112
* .gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.36/6c62681a2f655b49963a5983b8b0950a6120ae14/slf4j-api-1.7.36.jar
1213
* .m2/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
1314
*/
15+
@NullMarked
1416
final class FilePathToModuleCoordinates {
1517

1618
@Nullable

src/main/java/org/gradlex/javamodule/moduleinfo/IdValidator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package org.gradlex.javamodule.moduleinfo;
33

4+
import org.jspecify.annotations.NullMarked;
5+
6+
@NullMarked
47
class IdValidator {
58
private static final String COORDINATES_PATTERN = "^[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+(\\|[a-zA-Z0-9._-]+)?$";
69
private static final String FILE_NAME_PATTERN = "^[a-zA-Z0-9._-]+\\.(jar|zip)$";

src/main/java/org/gradlex/javamodule/moduleinfo/KnownModule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package org.gradlex.javamodule.moduleinfo;
33

4+
import org.jspecify.annotations.NullMarked;
5+
6+
@NullMarked
47
public class KnownModule extends ModuleSpec {
58

69
KnownModule(String identifier, String moduleName) {

0 commit comments

Comments
 (0)