Skip to content

Commit abcce2f

Browse files
committed
NonNullApi annotation -> NullMarked annotation
Gradle 9.x moved to the common JSpecify annotations.
1 parent fc3f3a6 commit abcce2f

File tree

10 files changed

+22
-21
lines changed

10 files changed

+22
-21
lines changed

src/main/java/org/gradlex/jvm/dependency/conflict/detection/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/aopalliance/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules.aopalliance;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/bouncycastle/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules.bouncycastle;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/guava/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules.guava;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/jakarta/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules.jakarta;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/logging/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules.logging;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.detection.rules;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/detection/util/VersionNumber.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
package org.gradlex.jvm.dependency.conflict.detection.util;
1818

19-
import javax.annotation.Nullable;
19+
import org.jspecify.annotations.Nullable;
20+
2021
import java.util.Objects;
2122

2223
/**
@@ -87,12 +88,12 @@ public static VersionNumber version(int major, int minor) {
8788
}
8889

8990
public static VersionNumber parse(String versionString) {
90-
if (versionString == null || versionString.length() == 0) {
91+
if (versionString == null || versionString.isEmpty()) {
9192
return UNKNOWN;
9293
}
9394
Scanner scanner = new Scanner(versionString);
9495

95-
int major = 0;
96+
int major;
9697
int minor = 0;
9798
int micro = 0;
9899
int patch = 0;

src/main/java/org/gradlex/jvm/dependency/conflict/resolution/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.resolution;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

src/main/java/org/gradlex/jvm/dependency/conflict/resolution/rules/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@NonNullApi
17+
@NullMarked
1818
package org.gradlex.jvm.dependency.conflict.resolution.rules;
1919

20-
import org.gradle.api.NonNullApi;
20+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)