Skip to content

Commit c87bea9

Browse files
Kotlin, Gradle & dependency updates (#33)
* Gradle update * Java version update * Kotlin + dependencies update * XMPSidecar.kt contains a constant useful for dependant projects * Bumped version number
1 parent 8f5d022 commit c87bea9

211 files changed

Lines changed: 221 additions & 215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v3
2525
with:
2626
distribution: 'temurin'
27-
java-version: '17.0.10+7'
27+
java-version: '17.0.13+11'
2828
- name: Select XCode 15.2
2929
run: |
3030
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-java@v3
3232
with:
3333
distribution: 'temurin'
34-
java-version: '18.0.2+9'
34+
java-version: '17.0.13+11'
3535
- name: Gradle Cache
3636
uses: actions/cache@v3
3737
with:

README.md

Lines changed: 2 additions & 2 deletions

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
33
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
44

55
plugins {
6-
kotlin("multiplatform") version "2.0.21"
6+
kotlin("multiplatform") version "2.1.0"
77
id("com.android.library") version "8.5.0"
88
id("maven-publish")
99
id("signing")
10-
id("io.gitlab.arturbosch.detekt") version "1.23.6"
10+
id("io.gitlab.arturbosch.detekt") version "1.23.7"
1111
id("org.sonarqube") version "4.3.1.3277"
1212
id("org.jetbrains.kotlinx.kover") version "0.6.1"
1313
id("com.asarkar.gradle.build-time-tracker") version "4.3.0"
1414
id("me.qoomon.git-versioning") version "6.4.4"
15-
id("com.goncalossilva.resources") version "0.9.0"
15+
id("com.goncalossilva.resources") version "0.10.0"
1616
id("com.github.ben-manes.versions") version "0.51.0"
1717
id("org.jetbrains.dokka") version "1.9.20"
1818
}
@@ -24,8 +24,8 @@ repositories {
2424

2525
val productName = "Ashampoo XMP Core"
2626

27-
val xmlUtilVersion: String = "0.90.2"
28-
val kotlinIoVersion: String = "0.5.4"
27+
val xmlUtilVersion: String = "0.90.3"
28+
val kotlinIoVersion: String = "0.6.0"
2929

3030
description = productName
3131
group = "com.ashampoo"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.ashampoo.xmp
2+
3+
/**
4+
* Default suffix for XMP sidecar files: ".xmp"
5+
*/
6+
public const val XMP_SIDECAR_SUFFIX: String = ".xmp"

src/commonMain/kotlin/com/ashampoo/xmp/XMPVersionInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public object XMPVersionInfo {
99

1010
public const val MAJOR: Int = 1
1111
public const val MINOR: Int = 4
12-
public const val PATCH: Int = 2
12+
public const val PATCH: Int = 3
1313

1414
public const val VERSION_MESSAGE: String =
1515
"Ashampoo XMP Core $MAJOR.$MINOR.$PATCH"

src/commonTest/resources/com/ashampoo/xmp/empty.xmp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
2-
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.2">
2+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.3">
33
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
44
<rdf:Description rdf:about=""/>
55
</rdf:RDF>

src/commonTest/resources/com/ashampoo/xmp/new.xmp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
2-
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.2">
2+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.3">
33
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
44
<rdf:Description rdf:about=""
55
xmlns:MY="http://ns.mylollc.com/MyloEdit/"

src/commonTest/resources/com/ashampoo/xmp/rating.xmp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
2-
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.2">
2+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Ashampoo XMP Core 1.4.3">
33
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
44
<rdf:Description rdf:about=""
55
xmlns:xmp="http://ns.adobe.com/xap/1.0/"

0 commit comments

Comments
 (0)