diff --git a/build.gradle b/build.gradle index b3abf84..b93cec3 100644 --- a/build.gradle +++ b/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' -} diff --git a/example/build.gradle b/example/build.gradle index 7458b7a..3f65980 100644 --- a/example/build.gradle +++ b/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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 115e6ac..4e1cc9d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/readme.md b/readme.md index a252446..dd6a6cc 100644 --- a/readme.md +++ b/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. diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar new file mode 100644 index 0000000..3bef808 Binary files /dev/null and b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar differ diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.md5 b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.md5 new file mode 100644 index 0000000..63d9749 --- /dev/null +++ b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.md5 @@ -0,0 +1 @@ +d91f62fbe1bb73e8cf47b6203ebd2271 \ No newline at end of file diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.sha1 b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.sha1 new file mode 100644 index 0000000..904fad4 --- /dev/null +++ b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.jar.sha1 @@ -0,0 +1 @@ +6d1d8f5e555ec00fe236439879fabf645adb6411 \ No newline at end of file diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom new file mode 100644 index 0000000..89519fd --- /dev/null +++ b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom @@ -0,0 +1,45 @@ + + + 4.0.0 + com.justpinch + androidanalyzer + 1.5.0 + + + com.squareup.okhttp3 + logging-interceptor + 3.8.1 + runtime + + + com.squareup.okhttp3 + okhttp + 3.8.1 + runtime + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 1.3.60 + runtime + + + com.android.tools.build + gradle + 4.0.1 + runtime + + + org.sonarsource.scanner.gradle + sonarqube-gradle-plugin + 2.7 + runtime + + + io.gitlab.arturbosch.detekt + detekt-gradle-plugin + 1.13.1 + runtime + + + diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.md5 b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.md5 new file mode 100644 index 0000000..61a715c --- /dev/null +++ b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.md5 @@ -0,0 +1 @@ +8d94169654cf109077dde9f503d523bd \ No newline at end of file diff --git a/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.sha1 b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.sha1 new file mode 100644 index 0000000..114e883 --- /dev/null +++ b/repo/com/justpinch/androidanalyzer/1.5.0/androidanalyzer-1.5.0.pom.sha1 @@ -0,0 +1 @@ +4cf28bed30fd819f6f84cb909c1a7e509dcc4411 \ No newline at end of file diff --git a/repo/com/justpinch/androidanalyzer/maven-metadata.xml b/repo/com/justpinch/androidanalyzer/maven-metadata.xml index c8c6fac..8f15c1b 100644 --- a/repo/com/justpinch/androidanalyzer/maven-metadata.xml +++ b/repo/com/justpinch/androidanalyzer/maven-metadata.xml @@ -3,7 +3,7 @@ com.justpinch androidanalyzer - 1.4.1 + 1.5.0 1.1.0 1.1.1 @@ -19,7 +19,8 @@ 1.3.3 1.4.0 1.4.1 + 1.5.0 - 20191121090130 + 20200916212114 diff --git a/repo/com/justpinch/androidanalyzer/maven-metadata.xml.md5 b/repo/com/justpinch/androidanalyzer/maven-metadata.xml.md5 index b6e8e33..5a5142e 100644 --- a/repo/com/justpinch/androidanalyzer/maven-metadata.xml.md5 +++ b/repo/com/justpinch/androidanalyzer/maven-metadata.xml.md5 @@ -1 +1 @@ -30752d1725e411bacad77adb5dd8c921 \ No newline at end of file +a198f2d1ea7c09c36b1d7082777359ac \ No newline at end of file diff --git a/repo/com/justpinch/androidanalyzer/maven-metadata.xml.sha1 b/repo/com/justpinch/androidanalyzer/maven-metadata.xml.sha1 index 6681703..d966090 100644 --- a/repo/com/justpinch/androidanalyzer/maven-metadata.xml.sha1 +++ b/repo/com/justpinch/androidanalyzer/maven-metadata.xml.sha1 @@ -1 +1 @@ -e77702bc6a5f37911007358baa103bdacb152ce0 \ No newline at end of file +fe7380565057846d9faca394fbe1057aa6bfc2a1 \ No newline at end of file diff --git a/src/main/kotlin/com/justpinch/AndroidAnalyzer.kt b/src/main/kotlin/com/justpinch/AndroidAnalyzer.kt index 4f08c0e..9e6f3d1 100644 --- a/src/main/kotlin/com/justpinch/AndroidAnalyzer.kt +++ b/src/main/kotlin/com/justpinch/AndroidAnalyzer.kt @@ -253,7 +253,7 @@ class AndroidAnalyzer : Plugin { } (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 { 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() diff --git a/src/main/kotlin/com/justpinch/Utils.kt b/src/main/kotlin/com/justpinch/Utils.kt index b019fba..b4af332 100644 --- a/src/main/kotlin/com/justpinch/Utils.kt +++ b/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 = ('a'..'z') + ('A'..'Z') + ('0'..'9')