Update dependencies

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.3.30'
+    ext.kotlinVersion = '1.3.60'
     repositories {
         google()
         jcenter()
@@ -8,20 +8,21 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.3.2"
+        classpath "com.android.tools.build:gradle:4.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 apply plugin: 'kotlin'
 apply plugin: 'maven'
+apply plugin: 'jacoco'
 
 ext {
     okHttpVersion = "3.8.1"
 }
 
 group = 'com.justpinch'
-version = '1.4.1'
+version = '1.5.0'
 
 uploadArchives {
     repositories {
@@ -44,10 +45,10 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation "com.android.tools.build:gradle:3.3.2"
+    implementation "com.android.tools.build:gradle:4.0.1"
 
     implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
-    implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.1"
+    implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.13.1"
 }
 
 compileKotlin {
@@ -61,7 +62,3 @@ compileTestKotlin {
         jvmTarget = "1.8"
     }
 }
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.1'
-}

example/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.justpinch:androidanalyzer:1.4.1"
     }

gradle/wrapper/gradle-wrapper.properties

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

readme.md

@@ -241,6 +241,11 @@ Possible values are "true" and "false". If the variable is set to "true", the pl
 
 ## Changelog
 
+#### Version 1.4.5 - September 16, 2020
+Updated gradle, detekt and jacoco dependencies.
+
+-----------------------------------------------------------
+
 #### Version 1.4.1 - November 21, 2019
 Added a way to customize Sonarqube project key suffix.
 

repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.md5

@@ -0,0 +1 @@
+d91f62fbe1bb73e8cf47b6203ebd2271

repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.sha1

@@ -0,0 +1 @@
+6d1d8f5e555ec00fe236439879fabf645adb6411

repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.justpinch</groupId>
+  <artifactId>androidanalyzer</artifactId>
+  <version>1.5.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>logging-interceptor</artifactId>
+      <version>3.8.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>3.8.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk7</artifactId>
+      <version>1.3.60</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle</artifactId>
+      <version>4.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.scanner.gradle</groupId>
+      <artifactId>sonarqube-gradle-plugin</artifactId>
+      <version>2.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.gitlab.arturbosch.detekt</groupId>
+      <artifactId>detekt-gradle-plugin</artifactId>
+      <version>1.13.1</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.md5

@@ -0,0 +1 @@
+8d94169654cf109077dde9f503d523bd

repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.sha1

@@ -0,0 +1 @@
+4cf28bed30fd819f6f84cb909c1a7e509dcc4411

repo/com/justpinch/androidanalyzer/maven-metadata.xml

@@ -3,7 +3,7 @@
   <groupId>com.justpinch</groupId>
   <artifactId>androidanalyzer</artifactId>
   <versioning>
-    <release>1.4.1</release>
+    <release>1.5.0</release>
     <versions>
       <version>1.1.0</version>
       <version>1.1.1</version>
@@ -19,7 +19,8 @@
       <version>1.3.3</version>
       <version>1.4.0</version>
       <version>1.4.1</version>
+      <version>1.5.0</version>
     </versions>
-    <lastUpdated>20191121090130</lastUpdated>
+    <lastUpdated>20200916212114</lastUpdated>
   </versioning>
 </metadata>

repo/com/justpinch/androidanalyzer/maven-metadata.xml.md5

@@ -1 +1 @@
-30752d1725e411bacad77adb5dd8c921
+a198f2d1ea7c09c36b1d7082777359ac

repo/com/justpinch/androidanalyzer/maven-metadata.xml.sha1

@@ -1 +1 @@
-e77702bc6a5f37911007358baa103bdacb152ce0
+fe7380565057846d9faca394fbe1057aa6bfc2a1

src/main/kotlin/com/justpinch/AndroidAnalyzer.kt

@@ -253,7 +253,7 @@ class AndroidAnalyzer : Plugin<Project> {
         }
 
         (project.extensions.findByName("jacoco") as JacocoPluginExtension).apply {
-            this.toolVersion = "0.8.3"
+            this.toolVersion = "0.8.6"
         }
 
         params = project.extensions.create(ExtensionName, Params::class.java)
@@ -377,9 +377,9 @@ class AndroidAnalyzer : Plugin<Project> {
                         it.exclude(params.exclusions)
                     }
 
-                    it.classDirectories = proj.files(javaClassDirs, kotlinClassDirs)
-                    it.sourceDirectories = proj.files(params.sourceDirs)
-                    it.executionData = proj.files(params.testJacocoReportsPath)
+                    it.additionalClassDirs(proj.files(javaClassDirs, kotlinClassDirs))
+                    it.additionalSourceDirs(proj.files(params.sourceDirs))
+                    it.executionData(proj.files(params.testJacocoReportsPath))
 
                     it.doLast { task ->
                         (task as JacocoReport).generate()

src/main/kotlin/com/justpinch/Utils.kt

@@ -3,10 +3,10 @@ package com.justpinch
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import org.apache.commons.io.output.ByteArrayOutputStream
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.process.internal.ExecException
+import java.io.ByteArrayOutputStream
 import java.util.Random
 
 private val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')