diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b8ae4ec..f4bfa8f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,14 @@ jobs: timeout-minutes: 5 with: fetch-depth: 0 # no shallow clones for SonarQube - - name: Set up Java JDK 18 + - name: Set up Java JDK 17 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '18.0.2+9' - - name: Select XCode 15.0.1 + java-version: '17.0.10+7' + - name: Select XCode 15.2 run: | - sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer + sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer xcodebuild -version - name: Gradle Cache uses: actions/cache@v3 diff --git a/README.md b/README.md index 8dd5d1d4..8e3dbc58 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ of Ashampoo Photos, which, in turn, is driven by user community feedback. ## Installation ``` -implementation("com.ashampoo:kim:0.16.2") +implementation("com.ashampoo:kim:0.16.3") ``` For the targets `wasmJs` & `js` you also need to specify this: diff --git a/build.gradle.kts b/build.gradle.kts index 586ddaf1..36e13fd6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ repositories { val productName = "Ashampoo Kim" val ktorVersion: String = "2.3.8" -val xmpCoreVersion: String = "1.2.0" +val xmpCoreVersion: String = "1.2.1" val dateTimeVersion: String = "0.5.0" val testRessourcesVersion: String = "0.4.0" val ioCoreVersion: String = "0.3.2" @@ -163,8 +163,8 @@ kotlin { jvm { java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } @@ -293,7 +293,6 @@ kotlin { dependsOn(posixMain) } - val iosArm64Main by sourceSets.getting val iosX64Main by sourceSets.getting val iosSimulatorArm64Main by sourceSets.getting diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 509c4a29..20db9ad5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp b/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp index 1df2bea6..b3e0bc45 100644 --- a/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp +++ b/src/commonTest/resources/com/ashampoo/kim/testdata/xmp/acdsee_sample_mod.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg index ebf2290c..37e3c7cd 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg.txt index 1601948d..a92de7d6 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_persons.jpg.txt @@ -135,7 +135,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg index cb34fadb..92a0e204 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg and b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt index 08d0fb45..6853b0dd 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jpg/new_rating.jpg.txt @@ -135,7 +135,7 @@ Keywords (25) = 'people' ---- XMP ---- - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl index 2319f2a7..bea71bd7 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl.txt index 8aa4f018..bfd09d17 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_persons.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl index 2b8be0da..e0afe89b 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl and b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt index a07ccac6..d1c1211b 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_jxl/new_rating.jxl.txt @@ -61,7 +61,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png index 46b830f3..f2189c0b 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt index c381d24a..bf0c6d8e 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_keywords.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png index 04aa3087..fb09f7b0 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png and b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt index 88888f24..65fdaa22 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_png/new_persons.png.txt @@ -130,7 +130,7 @@ Time Created (60) = '15:28:58-15:28' ---- XMP ---- - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp index 783569cf..ae8a2684 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt index 9cef5563..3faf505a 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_keywords.webp.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp index 4068ba8b..df5539b3 100644 Binary files a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp and b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp differ diff --git a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt index acfc3a98..5a09613c 100644 --- a/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt +++ b/src/commonTest/resources/com/ashampoo/kim/updates_webp/new_persons.webp.txt @@ -62,7 +62,7 @@ Little-endian (Intel, II) ---- XMP ---- - + - + - + - + - + - + - +