From 2815304b1a802c37ec4ac2e9fcd16de242680dec Mon Sep 17 00:00:00 2001 From: Stefan Oltmann Date: Sun, 10 Dec 2023 11:28:50 +0100 Subject: [PATCH] Dependency & configuration updates (#15) * Removed unused parameter * Dependency updates & removed unused dependency * Updated detekt config * Bumped version * Configuration fixed * Missed dependency update * Stay with old SonarQube --- README.md | 2 +- build.gradle.kts | 30 +++++-------------- .../kotlin/com/ashampoo/xmp/XMPMeta.kt | 3 +- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 33e0675..6c8068b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It's part of [Ashampoo Photos](https://ashampoo.com/photos). ## Installation ``` -implementation("com.ashampoo:xmpcore:0.2.2") +implementation("com.ashampoo:xmpcore:0.2.3") ``` ## How to use diff --git a/build.gradle.kts b/build.gradle.kts index 304c6ea..d2de09c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("com.android.library") version "8.0.2" id("maven-publish") id("signing") - id("io.gitlab.arturbosch.detekt") version "1.23.3" + id("io.gitlab.arturbosch.detekt") version "1.23.4" id("org.sonarqube") version "4.3.1.3277" id("org.jetbrains.kotlinx.kover") version "0.6.1" id("com.asarkar.gradle.build-time-tracker") version "4.3.0" @@ -22,7 +22,6 @@ repositories { val productName = "Ashampoo XMP Core" -val ktorVersion: String = "2.3.6" val xmlUtilVersion: String = "0.86.2" description = productName @@ -78,25 +77,16 @@ sonar { ) ) - /* Include Android Lint */ - property("sonar.android.lint.report", "${project.buildDir}/reports/lint-results.xml") - - /* Include Detekt issues */ - val detektPath = "${project.buildDir}/reports/detekt/detekt.xml" - println("Detekt report: $detektPath") - property("sonar.kotlin.detekt.reportPaths", detektPath) - - /* Include Kover code coverage */ - val koverPath = "${project.buildDir}/reports/kover/xml/report.xml" - println("Kover report: $koverPath") - property("sonar.coverage.jacoco.xmlReportPaths", koverPath) + property("sonar.android.lint.report", "build/reports/lint-results.xml") + property("sonar.kotlin.detekt.reportPaths", "build/reports/detekt/detekt.xml") + property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/kover/xml/report.xml") } } detekt { - source = files("src", "build.gradle.kts") + source.from("src", "build.gradle.kts") allRules = true - config = files("detekt.yml") + config.setFrom("$projectDir/detekt.yml") parallel = true ignoreFailures = true autoCorrect = true @@ -111,7 +101,7 @@ koverMerged { } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.3") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4") } kotlin { @@ -148,12 +138,6 @@ kotlin { dependencies { - /* - * Needed for Charset class. - * Defined as api() to prevent problems when used from a pure-java project. - */ - api("io.ktor:ktor-io:$ktorVersion") - /* Needed to parse XML and create a DOM Document */ api("io.github.pdvrieze.xmlutil:core:$xmlUtilVersion") api("io.github.pdvrieze.xmlutil:serialization:$xmlUtilVersion") diff --git a/src/commonMain/kotlin/com/ashampoo/xmp/XMPMeta.kt b/src/commonMain/kotlin/com/ashampoo/xmp/XMPMeta.kt index 961da7c..b0ee4d9 100644 --- a/src/commonMain/kotlin/com/ashampoo/xmp/XMPMeta.kt +++ b/src/commonMain/kotlin/com/ashampoo/xmp/XMPMeta.kt @@ -1072,8 +1072,7 @@ class XMPMeta { altTextName: String, genericLang: String?, specificLang: String, - itemValue: String, - options: PropertyOptions = PropertyOptions() + itemValue: String ) { if (schemaNS.isEmpty())