Update Android Gradle Plugin, Kotlin and other dependencies (#23)

Also includes some minor code-style fixes

Author: Rolf-Smit

gradle/dependencies.gradle

@@ -1,26 +1,26 @@
 ext {
     projectVersion = [
             minSdk    : 19,
-            targetSdk : 29,
-            compileSdk: 29,
-            kotlin    : "1.3.61"
+            targetSdk : 30,
+            compileSdk: 30,
+            kotlin    : "1.4.31"
     ]
     projectDependency = [
 
             // Gradle Plugins
             kotlinPlugin       : "org.jetbrains.kotlin:kotlin-gradle-plugin:${projectVersion.kotlin}",
-            androidGradlePlugin: "com.android.tools.build:gradle:3.6.1",
+            androidGradlePlugin: "com.android.tools.build:gradle:4.1.2",
 
             // Dependencies
-            kotlinStdlibJdk7   : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${projectVersion.kotlin}",
-            appCompat          : "androidx.appcompat:appcompat:1.1.0",
+            kotlinStdlibJdk8   : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${projectVersion.kotlin}",
+            appCompat          : "androidx.appcompat:appcompat:1.2.0",
 
             // Test dependencies
-            junit              : "junit:junit:4.13",
-            truth              : "com.google.truth:truth:1.0.1",
+            junit              : "junit:junit:4.13.2",
+            truth              : "com.google.truth:truth:1.1.2",
             supportTestRunner  : "androidx.test:runner:1.2.0",
-            espressoCore       : "androidx.test.espresso:espresso-core:3.2.0",
-            androidJUnit       : "androidx.test.ext:junit:1.1.1",
+            espressoCore       : "androidx.test.espresso:espresso-core:3.3.0",
+            androidJUnit       : "androidx.test.ext:junit:1.1.2",
             commonsCsv         : "org.apache.commons:commons-csv:1.8",
             kotlinTest         : "org.jetbrains.kotlin:kotlin-test:${projectVersion.kotlin}"
     ]

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -85,14 +85,12 @@ test {
 dependencies {
     compileOnly gradleApi()
     implementation projectDependency.androidGradlePlugin
-    implementation projectDependency.kotlinStdlibJdk7
+    implementation projectDependency.kotlinStdlibJdk8
 
-    testImplementation projectDependency.kotlinStdlibJdk7
+    testImplementation projectDependency.kotlinStdlibJdk8
     testImplementation projectDependency.kotlinTest
     testImplementation gradleTestKit()
     testImplementation projectDependency.junit
     testImplementation projectDependency.truth
     testImplementation projectDependency.commonsCsv
 }
-
-// apply from: rootProject.file('publish.gradle')

plugin/build.gradle

@@ -15,7 +15,7 @@ import org.gradle.testing.jacoco.tasks.JacocoReport
 @Suppress("unused")
 class RootCoveragePlugin : Plugin<Project> {
 
-    private lateinit var rootProjectExtension: RootCoveragePluginExtension;
+    private lateinit var rootProjectExtension: RootCoveragePluginExtension
 
     override fun apply(project: Project) {
         if (project.rootProject !== project) {
@@ -142,7 +142,7 @@ class RootCoveragePlugin : Plugin<Project> {
         val extension = subProject.extensions.findByName("android")
         if (extension == null) {
             // TODO support java modules?
-            subProject.logger.warn("Note: Skipping code coverage for module '${subProject.name}', currently the RootCoveragePlugin does not yet support Java Library Modules.");
+            subProject.logger.warn("Note: Skipping code coverage for module '${subProject.name}', currently the RootCoveragePlugin does not yet support Java Library Modules.")
             return
         } else if (extension is com.android.build.gradle.FeatureExtension) {
             // TODO support feature modules?

plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt

@@ -24,7 +24,7 @@ class CoverageReport private constructor(
         find(packageName, className).assertFullCoverageCoverage()
     }
 
-    fun find(packageName: String, className: String): CSVRecord? = records.find {
+    private fun find(packageName: String, className: String): CSVRecord? = records.find {
         it[packageColumn] == packageName && it[classColumn] == className
     }
 

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/CsvCoverageReport.kt

@@ -60,7 +60,7 @@ class IntegrationTest(
 
             val testFixtures = File("src/test/test-fixtures").listFiles()?.filter { it.isDirectory }
                     ?: error("Could not list test fixture directories")
-            val gradleVersions = arrayOf("5.6.4", "6.1.1", "6.2.1")
+            val gradleVersions = arrayOf("6.5.1", "6.6.1", "6.7.1", "6.8.3")
             return testFixtures.flatMap { file ->
                 gradleVersions.map { gradleVersion ->
                     arrayOf("${file.name}-$gradleVersion", file, gradleVersion)

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt

@@ -8,7 +8,7 @@ import java.io.Writer
  * adding extra new lines to the generated output in the console. This is a small fix for that, it
  * might not be the fastest, but it works.
  */
-class SystemOutputWriter private constructor(private val output: OutputStream) : Writer() {
+class SystemOutputWriter private constructor(output: OutputStream) : Writer() {
 
     private val bufferedWriter = output.bufferedWriter(Charsets.UTF_8)
 

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/util/SystemOuputWriter.kt

@@ -30,12 +30,21 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     implementation project(":library_android")
 
-    implementation projectDependency.kotlinStdlibJdk7
+    implementation projectDependency.kotlinStdlibJdk8
     implementation projectDependency.appCompat
 
     testImplementation projectDependency.junit

plugin/src/test/test-fixtures/multi-module/app/build.gradle

@@ -35,10 +35,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
-    implementation projectDependency.kotlinStdlibJdk7
+    implementation projectDependency.kotlinStdlibJdk8
     implementation projectDependency.appCompat
 
     testImplementation projectDependency.junit