diff --git a/README.md b/README.md index cbefcea..eaab843 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # XMP Core for Kotlin Multiplatform -[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-blue.svg?logo=kotlin)](httpw://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.21-blue.svg?logo=kotlin)](httpw://kotlinlang.org) ![JVM](https://img.shields.io/badge/-JVM-gray.svg?style=flat) ![Android](https://img.shields.io/badge/-Android-gray.svg?style=flat) ![iOS](https://img.shields.io/badge/-iOS-gray.svg?style=flat) @@ -20,7 +20,7 @@ It's part of [Ashampoo Photo Organizer](https://ashampoo.com/photo-organizer). ## Installation ``` -implementation("com.ashampoo:xmpcore:1.4.1") +implementation("com.ashampoo:xmpcore:1.4.2") ``` ## How to use diff --git a/build.gradle.kts b/build.gradle.kts index b64c325..515a34f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework plugins { - kotlin("multiplatform") version "2.0.20" + kotlin("multiplatform") version "2.0.21" id("com.android.library") version "8.5.0" id("maven-publish") id("signing") @@ -24,8 +24,8 @@ repositories { val productName = "Ashampoo XMP Core" -val xmlUtilVersion: String = "0.90.2-beta1" -val kotlinIoVersion: String = "0.5.3" +val xmlUtilVersion: String = "0.90.2" +val kotlinIoVersion: String = "0.5.4" description = productName group = "com.ashampoo" @@ -104,7 +104,7 @@ koverMerged { } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7") } kotlin { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 707e499..5c40527 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/commonMain/kotlin/com/ashampoo/xmp/XMPVersionInfo.kt b/src/commonMain/kotlin/com/ashampoo/xmp/XMPVersionInfo.kt index 6f309c3..0cdde64 100644 --- a/src/commonMain/kotlin/com/ashampoo/xmp/XMPVersionInfo.kt +++ b/src/commonMain/kotlin/com/ashampoo/xmp/XMPVersionInfo.kt @@ -9,7 +9,7 @@ public object XMPVersionInfo { public const val MAJOR: Int = 1 public const val MINOR: Int = 4 - public const val PATCH: Int = 1 + public const val PATCH: Int = 2 public const val VERSION_MESSAGE: String = "Ashampoo XMP Core $MAJOR.$MINOR.$PATCH" diff --git a/src/commonTest/resources/com/ashampoo/xmp/empty.xmp b/src/commonTest/resources/com/ashampoo/xmp/empty.xmp index 8f34c77..f006c48 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/empty.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/empty.xmp @@ -1,5 +1,5 @@ - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/new.xmp b/src/commonTest/resources/com/ashampoo/xmp/new.xmp index 7a11d44..b5088ad 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/new.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/new.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_13_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_13_formatted_compact.xmp index 21c5948..a8e8e04 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_13_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_13_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_14_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_14_formatted_compact.xmp index 1d8ff3d..25c9b9a 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_14_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_14_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_15_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_15_formatted_compact.xmp index 4589e89..6af369f 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_15_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_15_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - dxfoto.ru - - - - - CC-BY 3.0 - - - - - dxfoto - published - - - - - dxfoto|published - - - - - - \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_1_compact_to_canonical.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_1_compact_to_canonical.xmp deleted file mode 100644 index 9d36a12..0000000 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_1_compact_to_canonical.xmp +++ /dev/null @@ -1,192 +0,0 @@ - - - - - 1 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - sharpen - 000000400000003f0000003f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 2 - - 0 - flip - ffffffff - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - basecurve - gz09eJxjYIAAM6vnNnqyn22E9n235b6aa3cy6rVdRaK9/Y970fYf95bbMzA0QPEoGEqADYnNhCELiVMAudcSGA== - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - clipping - 00000000e040f23c4ee4053efce6413f80c75b3f0000000000000000cdcc4c3ecdcc4c3ecdcc4c3fcdcc4c3ecdcc4c3fcdcc4c3fcdcc4c3ecdcc4c3f000000000000000000000000010000000000000001000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - clipping - 00000000501a1c3d0c5cb53d9a16443feef9503f0000000000000000cdcc4c3ecdcc4c3ecdcc4c3fcdcc4c3ecdcc4c3fcdcc4c3fcdcc4c3ecdcc4c3f000000000000000000000000010000000000000001000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - colisa - d0ccccbdd0cccc3dd0cc4cbd - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - bilat - 01000000cdcccc3ecdcc8c3f0000803ecdcc4c3e - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - sharpen - 000000400000803f0000003f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - bilat - 01000000cdcccc3ecdcc8c3f9a99993ecdcc4c3e - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 2 - - 0 - levels - 0000000000000000000048420000c842d9899d3dc332d53e8bac483f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - demosaic - 0000000000000000000000000100000000000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - cacorrect - 32000000 - - - - - 12 - 0 - 2 - - - dxfoto.ru - - - - - CC-BY 3.0 - - - - - dxfoto - published - - - 55,54.678955N - 36,57.808914E - 2.2.0.0 - - - dxfoto|published - - - 0 - _MG_9604.CR2 - - - - \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_1_formatted_canonical.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_1_formatted_canonical.xmp index 6bdb02f..30a5214 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_1_formatted_canonical.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_1_formatted_canonical.xmp @@ -1,5 +1,5 @@ - + - + - - - - 1 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - sharpen - 000000400000003f0000003f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 2 - - 0 - flip - ffffffff - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - basecurve - gz09eJxjYIAAM6vnNnqyn22E9n235b6aa3cy6rVdRaK9/Y970fYf95bbMzA0QPEoGEqADYnNhCELiVMAudcSGA== - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - clipping - 00000000e040f23c4ee4053efce6413f80c75b3f0000000000000000cdcc4c3ecdcc4c3ecdcc4c3fcdcc4c3ecdcc4c3fcdcc4c3fcdcc4c3ecdcc4c3f000000000000000000000000010000000000000001000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 5 - - 0 - clipping - 00000000501a1c3d0c5cb53d9a16443feef9503f0000000000000000cdcc4c3ecdcc4c3ecdcc4c3fcdcc4c3ecdcc4c3fcdcc4c3fcdcc4c3ecdcc4c3f000000000000000000000000010000000000000001000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - colisa - d0ccccbdd0cccc3dd0cc4cbd - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - bilat - 01000000cdcccc3ecdcc8c3f0000803ecdcc4c3e - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - sharpen - 000000400000803f0000003f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - bilat - 01000000cdcccc3ecdcc8c3f9a99993ecdcc4c3e - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 2 - - 0 - levels - 0000000000000000000048420000c842d9899d3dc332d53e8bac483f - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 3 - - 0 - demosaic - 0000000000000000000000000100000000000000 - - - - - gz11eJxjYGBgkGAAgRNODGiAEV0AJ2iwh+CRxQcA5qIZBA== - 8 - 1 - 1 - - 0 - cacorrect - 32000000 - - - - - 12 - 0 - 2 - - - dxfoto.ru - - - - - CC-BY 3.0 - - - - - dxfoto - published - - - 55,54.678955N - 36,57.808914E - 2.2.0.0 - - - dxfoto|published - - - 0 - _MG_9604.CR2 - - - - \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_1_roundtrip_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_1_roundtrip_compact.xmp deleted file mode 100644 index 170e8de..0000000 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_1_roundtrip_compact.xmp +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - dxfoto.ru - - - - - CC-BY 3.0 - - - - - dxfoto - published - - - - - dxfoto|published - - - - - - \ No newline at end of file diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_20_formatted_canonical.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_20_formatted_canonical.xmp index 39b5646..6389000 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_20_formatted_canonical.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_20_formatted_canonical.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_31_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_31_formatted_compact.xmp index 1d8ff3d..25c9b9a 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_31_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_31_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_34_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_34_formatted_compact.xmp index 1d8ff3d..25c9b9a 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_34_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_34_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_39_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_39_formatted_compact.xmp index 21c5948..a8e8e04 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_39_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_39_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_41_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_41_formatted_compact.xmp index 21c5948..a8e8e04 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_41_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_41_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_43_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_43_formatted_compact.xmp index ac4ef4d..464a6c7 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_43_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_43_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_44_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_44_formatted_compact.xmp index f2c1484..a6474f8 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_44_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_44_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/src/commonTest/resources/com/ashampoo/xmp/sample_49_formatted_compact.xmp b/src/commonTest/resources/com/ashampoo/xmp/sample_49_formatted_compact.xmp index 1d8ff3d..25c9b9a 100644 --- a/src/commonTest/resources/com/ashampoo/xmp/sample_49_formatted_compact.xmp +++ b/src/commonTest/resources/com/ashampoo/xmp/sample_49_formatted_compact.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +