jCenter removal and Gradle 7 Updates (#239)

* Version updates and compat fixes

* More dependency updates

* Updated PMD to execute Gradle plugin instead of embedded

* Removed findbugs and added checkstyle plugin mode

* jCenter removal

* Added stkent diff parser to source

* README updates and ktlint fixes

* Fixed ktlint issue on subprojects not finding source

* Publishing updates

Author: btkelly

.gitignore

@@ -1,3 +1,4 @@
+*.hprof
 
 .idea/
 build/

README.md

@@ -19,27 +19,20 @@ Violations that are not associated with a specific line in your PR will be aggre
 
 ## Usage
 
-**Requires JDK 8**
+**Requires JDK 12 or Higher**
 
-Gnag is meant to be simple to use and easy to drop in to any Android project. Shown below is the simplest
-Gnag setup that will report violations to GitHub. By default this config will report PMD, Findbugs, Checkstyle and
+Gnag is meant to be simple to use and easy to drop in to any JVM based project. Shown below is the simplest
+Gnag setup that will report violations to GitHub. By default this config will report PMD, Checkstyle, ktlint, detekt and
 Android Lint to GitHub.
 
 <details open>
 <summary><b>build.gradle (Groovy)</b></summary>
 
 ```groovy
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.btkelly:gnag:{current version}'
-    }
+plugins {
+  id "com.btkelly.gnag" version "{current version}"
 }
 
-apply plugin: 'gnag'
-
 gnag {
     github {
         repoName 'btkelly/repo'
@@ -55,17 +48,8 @@ gnag {
 <summary><b>build.gradle.kts (Kotlin)</b></summary>
 
 ```kotlin
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.btkelly:gnag:{current version}")
-    }
-}
-
 plugins {
-    id("gnag")
+  id("com.btkelly.gnag") version "{current version}"
 }
 
 gnag {
@@ -105,28 +89,25 @@ gnag {
 
     checkstyle {
         enabled true
+        toolVersion "8.45.1"
         reporterConfig project.file('config/checkstyle.xml')
     }
 
     pmd {
         enabled true
+        toolVersion "6.22.0"
         reporterConfig project.file('config/pmd.xml')
     }
 
-    findbugs {
-        enabled true
-        reporterConfig project.file('config/findbugs.xml')
-    }
-
     ktlint {
         enabled true
-        toolVersion "0.35.0"
+        toolVersion "0.42.0"
     }
 
     detekt {
         enabled true
         reporterConfig project.file('config/detekt.yml')
-        toolVersion "1.0.1"
+        toolVersion "1.17.1"
     }
 
     androidLint {
@@ -158,19 +139,16 @@ gnag {
 
     checkstyle {
         isEnabled = true
+        toolVersion("8.45.1")
         reporterConfig(project.file("config/checkstyle.xml"))
     }
 
     pmd {
         isEnabled = true
+        toolVersion("6.22.0")
         reporterConfig(project.file("config/pmd.xml"))
     }
 
-    findbugs {
-        isEnabled = true
-        reporterConfig(project.file("config/findbugs.xml"))
-    }
-
     ktlint {
         isEnabled = true
         toolVersion("0.35.0")
@@ -233,20 +211,19 @@ gnag {
 
 - ***checkstyle*** - block to customize the checkstyle reporter
   - ***enabled*** - set if checkstyle should execute
+  - ***toolVersion*** - override the checkstyle version
   - ***reporterConfig*** - provide a custom [checkstyle config](http://checkstyle.sourceforge.net/config.html) (see the default config [here](/plugin/src/main/resources/checkstyle.xml))
 - ***pmd*** - block to customize the PMD reporter
   - ***enabled*** - set if PMD should execute
+  - ***toolVersion*** - override the PMD version
   - ***reporterConfig*** - provide a custom [PMD config](http://pmd.sourceforge.net/pmd-5.1.1/howtomakearuleset.html) (see the default config [here](/plugin/src/main/resources/pmd.xml))
-- ***findbugs*** - block to customize the findbugs reporter
-  - ***enabled*** - set if findbugs should execute
-  - ***reporterConfig*** - provide a custom [findbugs config](http://findbugs.sourceforge.net/manual/filter.html)
 - ***ktlint*** - block to customize the ktlint reporter
   - ***enabled*** - set if ktlint should execute
-  - **toolVersion** - override the ktlint version compiled into Gnag
+  - ***toolVersion*** - override the ktlint version
 - ***detekt*** - block to customize the detekt reporter
   - ***enabled*** - set if detekt should execute
   - ***reporterConfig*** - provide a custom [detekt config](https://arturbosch.github.io/detekt/configurations.html)
-  - ***toolVersion*** - override the detekt version compiled into Gnag
+  - ***toolVersion*** - override the detekt version
 - ***androidLint*** - block to customize the android lint reporter
   - ***enabled*** - set if the android lint reporter should look for a lint report
   - ***severity*** - can be 'Error' or 'Warning' (case insensitive) depending on which severity you want Gnag to check
@@ -267,20 +244,14 @@ To enforce the same quality checks across multiple Gradle modules, apply and con
 <summary><b>build.gradle (Groovy)</b></summary>
 
 ```groovy
-buildscript {
-    repositories {
-        // ...
-        jcenter()
-    }
-
-    dependencies {
-        // ...
-        classpath 'com.btkelly:gnag:2.4.1'
-    }
+plugins {
+  id "com.btkelly.gnag" version "{current version}" apply false
 }
 
 subprojects {
-    apply plugin: 'gnag'
+    plugins {
+      id "com.btkelly.gnag"
+    }
 
     gnag {
         // Standard Gnag configuration goes here.
@@ -297,20 +268,14 @@ subprojects {
 <summary><b>build.gradle.kts (Kotlin)</b></summary>
 
 ```kotlin
-buildscript {
-    repositories {
-        // ...
-        jcenter()
-    }
-
-    dependencies {
-        // ...
-        classpath("com.btkelly:gnag:2.4.1")
-    }
+plugins {
+  id("com.btkelly.gnag") version "{current version}" apply false
 }
 
 subprojects {
-    apply(plugin = "gnag")
+    plugins {
+      id("com.btkelly.gnag")
+    }
 
     configure<com.btkelly.gnag.extensions.GnagPluginExtension> {
         // Standard Gnag configuration goes here.

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }

example-android-kts/app/build.gradle.kts

@@ -1,8 +1,7 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("com.github.hierynomus.license").version("0.15.0")
-    id("com.btkelly.gnag") version "2.5.0"
+    id("com.btkelly.gnag") version "2.6.0"
 }
 
 apply {
@@ -30,24 +29,13 @@ android {
     sourceSets {
         getByName("main").java.srcDirs("src/main/kotlin")
     }
-
-    lintOptions {
-        setAbortOnError(false)
-    }
 }
 
 dependencies {
-    implementation("androidx.appcompat:appcompat:1.2.0")
-    testImplementation("junit:junit:4.13")
+    implementation("androidx.appcompat:appcompat:1.3.1")
+    testImplementation("junit:junit:4.13.2")
 }
 
-license {
-    header = file("../../LICENSE_HEADER.txt")
-    strictCheck = true
-}
-
-tasks.getByName("clean").dependsOn("licenseFormat")
-
 gnag {
     isEnabled = true
     setFailOnError(true)

example-android-kts/app/src/androidTest/java/com/gnag/example/ApplicationTest.java

@@ -1,19 +1,17 @@
 buildscript {
     repositories {
-        mavenLocal()
-        jcenter()
+        mavenCentral()
         google()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+        classpath("com.android.tools.build:gradle:7.0.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         mavenCentral()
         google()
     }

example-android-kts/build.gradle.kts

@@ -1,3 +1,2 @@
 android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home
+android.useAndroidX=true

example-android-kts/gradle.properties

@@ -1,6 +1,5 @@
-#Sun Sep 20 11:27:32 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

example-android-kts/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"