Update dependencies to latest and greatest. (#177)

vanniktech · Feb 18, 2019 · e229901 · e229901
1 parent 7333286
commit e229901
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
-  ext.kotlinVersion = '1.3.11'
-  ext.androidGradlePluginVersion = '3.3.0'
+  ext.kotlinVersion = '1.3.21'
+  ext.androidGradlePluginVersion = '3.3.1'
 
   repositories {
     mavenCentral()
@@ -10,11 +10,11 @@ buildscript {
 
   dependencies {
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-    classpath 'com.gradle.publish:plugin-publish-plugin:0.10.0'
+    classpath 'com.gradle.publish:plugin-publish-plugin:0.10.1'
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
-    classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.12.0'
+    classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.16.0'
     classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.13.0'
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.7.0'
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
   }
 }
 
@@ -29,10 +29,10 @@ apply plugin: 'com.gradle.plugin-publish'
 
 codeQualityTools {
   ktlint {
-    toolVersion = '0.29.0'
+    toolVersion = '0.30.0'
   }
   detekt {
-    toolVersion = '1.0.0.RC8'
+    toolVersion = '1.0.0-RC12'
   }
   findbugs {
     enabled = false
@@ -77,15 +77,15 @@ tasks.getByName('pluginUnderTestMetadata').getPluginClasspath().from(configurati
 
 dependencies {
   api gradleApi()
-  api 'de.aaschmid:gradle-cpd-plugin:1.1'
+  api 'de.aaschmid:gradle-cpd-plugin:1.2'
   api 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.14'
 
   compileOnly "com.android.tools.build:gradle:$androidGradlePluginVersion"
   compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
   testImplementation "com.android.tools.build:gradle:$androidGradlePluginVersion"
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.11.1'
+  testImplementation 'junit:junit:4.13-beta-2'
+  testImplementation 'org.assertj:assertj-core:3.12.0'
   testImplementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
   fixtureClasspath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

diff --git a/code_quality_tools/detekt.yml b/code_quality_tools/detekt.yml
@@ -6,11 +6,17 @@ potential-bugs:
   LateinitUsage:
     active: false # We know what we're doing.
 
+exceptions:
+  SwallowedException:
+    active: false # https://github.com/arturbosch/detekt/issues/1408
+
 style:
   TopLevelPropertyNaming:
     active: false
   MaxLineLength:
     active: false
+  UnnecessaryApply:
+    active: false # https://github.com/arturbosch/detekt/issues/1305
 
 comments:
   UndocumentedPublicClass:

diff --git a/gradlew b/gradlew
@@ -28,7 +28,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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/src/main/kotlin/com/vanniktech/code/quality/tools/KotlinExtension.kt b/src/main/kotlin/com/vanniktech/code/quality/tools/KotlinExtension.kt
@@ -2,7 +2,7 @@ package com.vanniktech.code.quality.tools
 
 open class KotlinExtension {
   /**
-   * Ability to treat all Kotlin compiler warnings as errors
+   * Ability to treat all Kotlin compiler warnings as errors.
    * @since 0.17.0
    */
   var allWarningsAsErrors: Boolean = true

diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt
@@ -187,7 +187,8 @@ class CodeQualityToolsPluginDetektTest {
     fun withKotlinFile(path: String, content: String) = write(path, content)
 
     private fun write(path: String, content: String) = apply {
-      directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
+      val paths = path.split("/").dropLast(1).toTypedArray()
+      if (paths.isNotEmpty()) directory.newFolder(*paths)
       directory.newFile(path).writeText(content)
     }
 

diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt
@@ -54,7 +54,8 @@ class CodeQualityToolsPluginKotlinTest {
     fun withKotlinFile(path: String, content: String) = write(path, content)
 
     private fun write(path: String, content: String) = apply {
-      directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
+      val paths = path.split("/").dropLast(1).toTypedArray()
+      if (paths.isNotEmpty()) directory.newFolder(*paths)
       directory.newFile(path).writeText(content)
     }
 

diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt
@@ -120,7 +120,8 @@ class CodeQualityToolsPluginKtlintTest {
     }
 
     private fun write(path: String, content: String) = apply {
-      directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
+      val paths = path.split("/").dropLast(1).toTypedArray()
+      if (paths.isNotEmpty()) directory.newFolder(*paths)
       directory.newFile(path).writeText(content)
     }