Skip to content

Commit

Permalink
Dependency & configuration updates (#15)
Browse files Browse the repository at this point in the history
* Removed unused parameter

* Dependency updates & removed unused dependency

* Updated detekt config

* Bumped version

* Configuration fixed

* Missed dependency update

* Stay with old SonarQube
  • Loading branch information
StefanOltmann authored Dec 10, 2023
1 parent d3bc7e6 commit 2815304
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 7 additions & 23 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -22,7 +22,6 @@ repositories {

val productName = "Ashampoo XMP Core"

val ktorVersion: String = "2.3.6"
val xmlUtilVersion: String = "0.86.2"

description = productName
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions src/commonMain/kotlin/com/ashampoo/xmp/XMPMeta.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1072,8 +1072,7 @@ class XMPMeta {
altTextName: String,
genericLang: String?,
specificLang: String,
itemValue: String,
options: PropertyOptions = PropertyOptions()
itemValue: String
) {

if (schemaNS.isEmpty())
Expand Down

0 comments on commit 2815304

Please sign in to comment.