Skip to content

Commit

Permalink
Use jspecify instead of jsr305
Browse files Browse the repository at this point in the history
  • Loading branch information
ak-git committed Aug 23, 2024
1 parent 194bc78 commit 3ddb9d2
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
java-version: 22
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 8.10
- name: Cache SonarCloud packages
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sonar {

allprojects {
group = 'com.ak'
version = '2024.08.16'
version = '2024.08.23'
apply plugin: 'idea'
apply plugin: 'java-library'
apply plugin: 'org.javamodularity.moduleplugin'
Expand Down
2 changes: 1 addition & 1 deletion hello/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
implementation libs.findbugs.jsr305
implementation libs.jspecify
testImplementation(platform(libs.junit))
testImplementation libs.bundles.test
}
Expand Down
2 changes: 1 addition & 1 deletion hello/src/main/java/com/ak/app/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ private MainApp() {
}

public static void main(String[] args) {
Logger.getLogger(MainApp.class.getName()).info(() -> "Hello word 2024.08.16!");
Logger.getLogger(MainApp.class.getName()).info(() -> "Hello word 2024.08.23!");
}
}
4 changes: 2 additions & 2 deletions hello/src/main/java/com/ak/app/package-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@ParametersAreNonnullByDefault
@NullMarked
package com.ak.app;

import javax.annotation.ParametersAreNonnullByDefault;
import org.jspecify.annotations.NullMarked;
2 changes: 1 addition & 1 deletion hello/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module com.ak.app {
requires java.logging;
requires jsr305;
requires org.jspecify;

exports com.ak.app;
}
4 changes: 2 additions & 2 deletions hello/src/test/java/com/ak/app/package-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@ParametersAreNonnullByDefault
@NullMarked
package com.ak.app;

import javax.annotation.ParametersAreNonnullByDefault;
import org.jspecify.annotations.NullMarked;
4 changes: 2 additions & 2 deletions libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ben-manes-versions = '0.51.0'
nebula-lint = '19.0.3'
dependency-analysis = '1.33.0'

jsr305 = '3.0.2'
jspecify = '1.0.0'
junit = '5.11.0'
assertj = '3.26.3'

Expand All @@ -21,7 +21,7 @@ nebula-lint = { id = 'nebula.lint', version.ref = 'nebula-lint' }
dependency-analysis = { id = 'com.autonomousapps.dependency-analysis', version.ref = 'dependency-analysis' }

[libraries]
findbugs-jsr305 = { module = 'com.google.code.findbugs:jsr305', version.ref = 'jsr305' }
jspecify = { module = 'org.jspecify:jspecify', version.ref = 'jspecify' }

junit = { module = 'org.junit:junit-bom', version.ref = 'junit' }
junit-jupiter = { module = 'org.junit.jupiter:junit-jupiter', version.ref = 'junit' }
Expand Down

0 comments on commit 3ddb9d2

Please sign in to comment.