From d7e2613ae2a0c2f149a3cb662044ee4b0dcf7abc Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 16 May 2021 07:52:48 -0700 Subject: [PATCH] Updated to Gradle 7.0.2 --- build.gradle.kts | 8 +++++--- detekt-baseline.xml | 8 ++++++++ examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 detekt-baseline.xml diff --git a/build.gradle.kts b/build.gradle.kts index 6b6df46..e4d22a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,11 @@ import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id("com.github.ben-manes.versions") version "0.38.0" - id("io.gitlab.arturbosch.detekt") version "1.17.0-RC1" + id("io.gitlab.arturbosch.detekt") version "1.17.0" id("org.jetbrains.dokka") version "1.4.32" id("org.sonarqube") version "3.2.0" kotlin("jvm") version "1.5.0" @@ -54,7 +55,7 @@ java { detekt { - toolVersion = "main-SNAPSHOT" + //toolVersion = "main-SNAPSHOT" } sonarqube { @@ -72,12 +73,13 @@ val javadocJar by tasks.creating(Jar::class) { tasks { withType().configureEach { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = java.targetCompatibility.toString() } withType { testLogging { exceptionFormat = TestExceptionFormat.FULL + events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED) } } diff --git a/detekt-baseline.xml b/detekt-baseline.xml new file mode 100644 index 0000000..c4d9ac8 --- /dev/null +++ b/detekt-baseline.xml @@ -0,0 +1,8 @@ + + + + + ThrowsCount:CryptoPrice.kt$CryptoPrice.Companion$ @JvmStatic @JvmOverloads @Throws(CryptoException::class, IOException::class) fun apiCall(paths: List<String>, params: Map<String, String> = emptyMap()): String + ThrowsCount:CryptoPrice.kt$CryptoPrice.Companion$@JvmStatic @Throws(CryptoException::class) fun String.toPrice(): CryptoPrice + + diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index e5338d3..0f80bbf 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e5338d3..0f80bbf 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-7.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists