Merge branch 'master' into toolchains-support

.github/workflows/codeql.yml

@@ -27,14 +27,9 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache: gradle
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1
 

.github/workflows/gradle.yml

@@ -22,21 +22,18 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: 11
+        cache: gradle
     - name: Read .nvmrc
       run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
       id: nvm
     - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
         node-version: '${{ steps.nvm.outputs.NVMRC }}'
-    - uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
+        cache: npm
+      if: matrix.gradle == '6.9'
     - name: Gradle Wrapper Validation
       uses: gradle/wrapper-validation-action@v1
     - name: Build with Gradle

.github/workflows/javadoc.yml

@@ -14,15 +14,17 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 11
+          cache: gradle
       - name: Read .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
+          cache: npm
       - name: Generate Groovydoc
         run: ./gradlew groovydoc
       - name: Prepare to Deploy

README.md

@@ -103,6 +103,8 @@ You can change SpotBugs version by [the `toolVersion` property of the spotbugs e
 
 |Gradle Plugin|SpotBugs|
 |-----:|-----:|
+| 4.7.5| 4.4.1|
+| 4.7.3| 4.4.0|
 | 4.7.2| 4.3.0|
 | 4.6.1| 4.2.1|
 | 4.5.0| 4.1.1|

build.gradle

@@ -3,11 +3,10 @@ plugins {
     id 'java-gradle-plugin'
     id 'jacoco'
     id 'signing'
-    id 'com.gradle.plugin-publish' version '0.15.0'
-    id 'com.diffplug.spotless' version '5.14.1'
-    id 'net.ltgt.errorprone' version '2.0.2'
+    id 'com.gradle.plugin-publish' version '0.16.0'
+    id 'com.github.spotbugs.gradle-plugin'
     id 'org.sonarqube' version '3.3'
-    id 'com.github.spotbugs' version '4.7.1'
+    id 'com.github.spotbugs' version '4.7.5'
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -22,8 +21,8 @@ repositories {
 }
 
 ext {
-    errorproneVersion = '2.7.1'
-    spotBugsVersion = '4.3.0'
+    errorproneVersion = '2.9.0'
+    spotBugsVersion = '4.4.1'
     slf4jVersion = '1.8.0-beta4'
     androidGradlePluginVersion = '4.2.2'
 }
@@ -33,14 +32,7 @@ dependencies {
     compileOnly localGroovy()
     compileOnly "com.github.spotbugs:spotbugs:${spotBugsVersion}"
     compileOnly "com.android.tools.build:gradle:${androidGradlePluginVersion}"
-    testImplementation 'com.tngtech.archunit:archunit:0.20.0'
-}
-
-tasks.named('groovydoc') {
-    docTitle 'SpotBugs Gradle Plugin'
-    link 'https://docs.gradle.org/current/javadoc/', 'org.gradle.api.'
-    link 'https://docs.oracle.com/en/java/javase/11/docs/api/', 'java.'
-    link 'https://docs.groovy-lang.org/latest/html/gapi/', 'groovy.', 'org.codehaus.groovy.'
+    testImplementation 'com.tngtech.archunit:archunit:0.21.0'
 }
 
 def signingKey = System.getenv("SIGNING_KEY")
@@ -82,8 +74,6 @@ tasks.named('processResources').configure {
 
 apply from: "$rootDir/gradle/test.gradle"
 apply from: "$rootDir/gradle/functional-test.gradle"
-apply from: "$rootDir/gradle/spotless.gradle"
-apply from: "$rootDir/gradle/errorprone.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
 defaultTasks 'spotlessApply', 'build'

buildSrc/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    `kotlin-dsl`
+    id("com.diffplug.spotless") version "5.15.0"
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.3")
+    implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.2")
+}
+
+spotless {
+    kotlinGradle {
+        ktlint()
+    }
+}

buildSrc/src/main/kotlin/com/github/spotbugs/com.github.spotbugs.gradle-plugin.gradle.kts

@@ -0,0 +1,38 @@
+import net.ltgt.gradle.errorprone.errorprone
+
+plugins {
+    id("com.diffplug.spotless")
+    id("net.ltgt.errorprone")
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    // disable warnings in generated code by immutables
+    // https://github.com/google/error-prone/issues/329
+    options.errorprone.disableWarningsInGeneratedCode.set(true)
+}
+
+tasks.withType<Groovydoc>().configureEach {
+    docTitle = "SpotBugs Gradle Plugin"
+    link("https://docs.gradle.org/current/javadoc/", "org.gradle.api.")
+    link("https://docs.oracle.com/en/java/javase/11/docs/api/", "java.")
+    link("https://docs.groovy-lang.org/latest/html/gapi/", "groovy.", "org.codehaus.groovy.")
+}
+
+spotless {
+    java {
+        licenseHeaderFile("gradle/HEADER.txt")
+        removeUnusedImports()
+        googleJavaFormat()
+    }
+    groovy {
+        licenseHeaderFile("gradle/HEADER.txt")
+        target("**/*.groovy")
+        greclipse()
+        indentWithSpaces()
+    }
+    groovyGradle {
+        target("**/*.gradle")
+        greclipse()
+        indentWithSpaces()
+    }
+}

gradle/publish.gradle

@@ -1,5 +1,4 @@
-// configuration to publish gradle plugin to plugin portal
-// https://guides.gradle.org/publishing-plugins-to-gradle-plugin-portal/
+apply plugin: 'maven-publish'
 
 pluginBundle {
     website = 'https://github.com/spotbugs/spotbugs-gradle-plugin'
@@ -27,3 +26,14 @@ gradlePlugin {
         }
     }
 }
+
+publishing.publications.all {
+    pom {
+        licenses {
+            license {
+                name = 'Apache License 2.0'
+                url = 'https://spdx.org/licenses/Apache-2.0.html'
+            }
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists