Skip to content

Commit c1d2ea6

Browse files
authored
Resolves Cpd Task Creation Failure (#204)
* Cpd: Bump cpd version to 3.1 * Cpd: Solves warnings for cpd extension adding method * Gradle: Bump gradle version to 6.3 * AndroidGradlePlugin: Bump version to 3.6.0
1 parent 86297b8 commit c1d2ea6

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext.kotlinVersion = '1.3.41'
3-
ext.androidGradlePluginVersion = '3.4.2'
3+
ext.androidGradlePluginVersion = '3.6.0'
44

55
repositories {
66
mavenCentral()
@@ -74,7 +74,7 @@ tasks.getByName('pluginUnderTestMetadata').getPluginClasspath().from(configurati
7474

7575
dependencies {
7676
api gradleApi()
77-
api 'de.aaschmid:gradle-cpd-plugin:1.2'
77+
api 'de.aaschmid:gradle-cpd-plugin:3.1'
7878
api 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.14'
7979

8080
compileOnly "com.android.tools.build:gradle:$androidGradlePluginVersion"
@@ -105,6 +105,6 @@ pluginBundle {
105105
}
106106

107107
wrapper {
108-
gradleVersion = '5.5.1'
108+
gradleVersion = '6.3'
109109
distributionType = Wrapper.DistributionType.ALL
110110
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@file:Suppress("Detekt.TooManyFunctions")
1+
@file:Suppress("Detekt.TooManyFunctions", "UnstableApiUsage")
22

33
package com.vanniktech.code.quality.tools
44

@@ -12,12 +12,9 @@ import de.aaschmid.gradle.plugins.cpd.CpdExtension
1212
import de.aaschmid.gradle.plugins.cpd.CpdPlugin
1313
import org.gradle.api.Plugin
1414
import org.gradle.api.Project
15-
import org.gradle.api.plugins.quality.Checkstyle
15+
import org.gradle.api.plugins.quality.*
1616
import org.gradle.api.plugins.quality.CheckstyleExtension
17-
import org.gradle.api.plugins.quality.CheckstylePlugin
18-
import org.gradle.api.plugins.quality.Pmd
1917
import org.gradle.api.plugins.quality.PmdExtension
20-
import org.gradle.api.plugins.quality.PmdPlugin
2118
import org.gradle.language.base.plugins.LifecycleBasePlugin.CHECK_TASK_NAME
2219
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2320
import java.io.File
@@ -60,11 +57,13 @@ fun androidGradlePluginVersion(): Revision {
6057

6158
try {
6259
return Revision.parseRevision(Class.forName("com.android.builder.Version").getDeclaredField("ANDROID_GRADLE_PLUGIN_VERSION").get(o).toString(), Revision.Precision.PREVIEW)
63-
} catch (ignored: Exception) {}
60+
} catch (ignored: Exception) {
61+
}
6462

6563
try {
6664
return Revision.parseRevision(Class.forName("com.android.builder.model.Version").getDeclaredField("ANDROID_GRADLE_PLUGIN_VERSION").get(o).toString(), Revision.Precision.PREVIEW)
67-
} catch (ignored: Exception) {}
65+
} catch (ignored: Exception) {
66+
}
6867

6968
throw IllegalArgumentException("Can't get Android Gradle Plugin version")
7069
}
@@ -153,7 +152,8 @@ fun Project.addCheckstyle(rootProject: Project, extension: CodeQualityToolsPlugi
153152
return false
154153
}
155154

156-
@Suppress("Detekt.ComplexMethod") fun Project.addLint(extension: CodeQualityToolsPluginExtension): Boolean {
155+
@Suppress("Detekt.ComplexMethod")
156+
fun Project.addLint(extension: CodeQualityToolsPluginExtension): Boolean {
157157
val isNotIgnored = !shouldIgnore(extension)
158158
val isEnabled = extension.lint.enabled
159159
val isAndroidProject = isAndroidProject()
@@ -276,7 +276,7 @@ fun Project.addCpd(extension: CodeQualityToolsPluginExtension): Boolean {
276276
extensions.configure(CpdExtension::class.java) {
277277
it.language = extension.cpd.language
278278
it.toolVersion = extension.pmd.toolVersion
279-
it.ignoreFailures = extension.cpd.ignoreFailures ?: !extension.failEarly
279+
it.isIgnoreFailures = extension.cpd.ignoreFailures ?: !extension.failEarly
280280
it.minimumTokenCount = extension.cpd.minimumTokenCount
281281
}
282282

@@ -289,7 +289,9 @@ fun Project.addCpd(extension: CodeQualityToolsPluginExtension): Boolean {
289289
it.reports.xml.isEnabled = extension.xmlReports
290290

291291
it.encoding = "UTF-8"
292-
it.source = fileTree(extension.cpd.source).filter { it.name.endsWith(".${extension.cpd.language}") }.asFileTree
292+
it.source = fileTree(extension.cpd.source).filter { source ->
293+
source.name.endsWith(".${extension.cpd.language}")
294+
}.asFileTree
293295
}
294296

295297
tasks.named(CHECK_TASK_NAME).configure { it.dependsOn("cpdCheck") }

0 commit comments

Comments
 (0)