Skip to content

Commit e229901

Browse files
authored
Update dependencies to latest and greatest. (#177)
1 parent 7333286 commit e229901

File tree

8 files changed

+25
-16
lines changed

8 files changed

+25
-16
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
2-
ext.kotlinVersion = '1.3.11'
3-
ext.androidGradlePluginVersion = '3.3.0'
2+
ext.kotlinVersion = '1.3.21'
3+
ext.androidGradlePluginVersion = '3.3.1'
44

55
repositories {
66
mavenCentral()
@@ -10,11 +10,11 @@ buildscript {
1010

1111
dependencies {
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
13-
classpath 'com.gradle.publish:plugin-publish-plugin:0.10.0'
13+
classpath 'com.gradle.publish:plugin-publish-plugin:0.10.1'
1414
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
15-
classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.12.0'
15+
classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.16.0'
1616
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.13.0'
17-
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.7.0'
17+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
1818
}
1919
}
2020

@@ -29,10 +29,10 @@ apply plugin: 'com.gradle.plugin-publish'
2929

3030
codeQualityTools {
3131
ktlint {
32-
toolVersion = '0.29.0'
32+
toolVersion = '0.30.0'
3333
}
3434
detekt {
35-
toolVersion = '1.0.0.RC8'
35+
toolVersion = '1.0.0-RC12'
3636
}
3737
findbugs {
3838
enabled = false
@@ -77,15 +77,15 @@ tasks.getByName('pluginUnderTestMetadata').getPluginClasspath().from(configurati
7777

7878
dependencies {
7979
api gradleApi()
80-
api 'de.aaschmid:gradle-cpd-plugin:1.1'
80+
api 'de.aaschmid:gradle-cpd-plugin:1.2'
8181
api 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.14'
8282

8383
compileOnly "com.android.tools.build:gradle:$androidGradlePluginVersion"
8484
compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
8585

8686
testImplementation "com.android.tools.build:gradle:$androidGradlePluginVersion"
87-
testImplementation 'junit:junit:4.12'
88-
testImplementation 'org.assertj:assertj-core:3.11.1'
87+
testImplementation 'junit:junit:4.13-beta-2'
88+
testImplementation 'org.assertj:assertj-core:3.12.0'
8989
testImplementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
9090

9191
fixtureClasspath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

code_quality_tools/detekt.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ potential-bugs:
66
LateinitUsage:
77
active: false # We know what we're doing.
88

9+
exceptions:
10+
SwallowedException:
11+
active: false # https://github.com/arturbosch/detekt/issues/1408
12+
913
style:
1014
TopLevelPropertyNaming:
1115
active: false
1216
MaxLineLength:
1317
active: false
18+
UnnecessaryApply:
19+
active: false # https://github.com/arturbosch/detekt/issues/1305
1420

1521
comments:
1622
UndocumentedPublicClass:

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
2828
APP_BASE_NAME=`basename "$0"`
2929

3030
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
31+
DEFAULT_JVM_OPTS='"-Xmx64m"'
3232

3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
1414
set APP_HOME=%DIRNAME%
1515

1616
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
17+
set DEFAULT_JVM_OPTS="-Xmx64m"
1818

1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome

src/main/kotlin/com/vanniktech/code/quality/tools/KotlinExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.vanniktech.code.quality.tools
22

33
open class KotlinExtension {
44
/**
5-
* Ability to treat all Kotlin compiler warnings as errors
5+
* Ability to treat all Kotlin compiler warnings as errors.
66
* @since 0.17.0
77
*/
88
var allWarningsAsErrors: Boolean = true

src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ class CodeQualityToolsPluginDetektTest {
187187
fun withKotlinFile(path: String, content: String) = write(path, content)
188188

189189
private fun write(path: String, content: String) = apply {
190-
directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
190+
val paths = path.split("/").dropLast(1).toTypedArray()
191+
if (paths.isNotEmpty()) directory.newFolder(*paths)
191192
directory.newFile(path).writeText(content)
192193
}
193194

src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ class CodeQualityToolsPluginKotlinTest {
5454
fun withKotlinFile(path: String, content: String) = write(path, content)
5555

5656
private fun write(path: String, content: String) = apply {
57-
directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
57+
val paths = path.split("/").dropLast(1).toTypedArray()
58+
if (paths.isNotEmpty()) directory.newFolder(*paths)
5859
directory.newFile(path).writeText(content)
5960
}
6061

src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ class CodeQualityToolsPluginKtlintTest {
120120
}
121121

122122
private fun write(path: String, content: String) = apply {
123-
directory.newFolder(*path.split("/").dropLast(1).toTypedArray())
123+
val paths = path.split("/").dropLast(1).toTypedArray()
124+
if (paths.isNotEmpty()) directory.newFolder(*paths)
124125
directory.newFile(path).writeText(content)
125126
}
126127

0 commit comments

Comments
 (0)