Merge pull request #35 from project-tsurugi/fix-ci-warnings

Fix build warnings for incompatible with Gradle 9.0
project-tsurugi · Feb 1, 2024 · 73b925b · 73b925b
2 parents b39ccae + 05a825d
commit 73b925b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -14,21 +14,21 @@ jobs:
 
     steps:
       - name: Setup_Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Assemble
         run: |
-          ./gradlew -i iceaxe-core:showTsubakuroManifest clean assemble
+          ./gradlew -i iceaxe-core:showTsubakuroManifest clean assemble --warning-mode all
 
       - name: Check
         run: |
-          ./gradlew -i check --continue
+          ./gradlew -i check --continue --warning-mode all
 
       - name: Verify
         uses: project-tsurugi/tsurugi-annotations-action@v1

diff --git a/.github/workflows/ci-javadoc.yml b/.github/workflows/ci-javadoc.yml
@@ -15,20 +15,20 @@ jobs:
 
     steps:
       - name: Setup_Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build_Javadoc
         run: |
-         ./gradlew -i clean iceaxe-core:javadoc
+         ./gradlew -i clean iceaxe-core:javadoc --warning-mode all
 
       - name: Publish_Javadoc
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: modules/iceaxe-core/build/docs/javadoc
 

diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
@@ -15,17 +15,17 @@ jobs:
 
     steps:
       - name: Setup_Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Publish
         run: |
-          ./gradlew -i iceaxe-core:showTsubakuroManifest clean publish
+          ./gradlew -i iceaxe-core:showTsubakuroManifest clean publish --warning-mode all
         env:
           ST_OSSRH_USER: ${{ secrets.ST_OSSRH_USER }}
           ST_OSSRH_PASSWORD: ${{ secrets.ST_OSSRH_PASSWORD }}

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'iceaxe.libs-conventions'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.1'
+    implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7'
 }
diff --git a/buildSrc/src/main/groovy/iceaxe.java-conventions.gradle b/buildSrc/src/main/groovy/iceaxe.java-conventions.gradle
@@ -49,7 +49,9 @@ tasks.withType(Javadoc) {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation platform('org.junit:junit-bom:5.10.1')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 checkstyle {
@@ -67,6 +69,10 @@ spotbugsMain {
             enabled = true
             destination = file("$buildDir/reports/spotbugs/main/spotbugs.xml")
         }
+        html {
+            enabled = true
+            destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
+        }
     }
 }
 

diff --git a/modules/iceaxe-core/config/spotbugs/spotbugsExclude.xml b/modules/iceaxe-core/config/spotbugs/spotbugsExclude.xml
@@ -23,5 +23,12 @@
     <Method name="~.*fillFrom.*" />
     <Bug pattern="OVERRIDING_METHODS_MUST_INVOKE_SUPER" />
   </Match>
+  <Match>
+    <Or>
+      <Bug pattern="CT_CONSTRUCTOR_THROW" />
+      <Bug pattern="EI_EXPOSE_REP" />
+      <Bug pattern="EI_EXPOSE_REP2" />
+    </Or>
+  </Match>
 
 </FindBugsFilter>