Skip to content

Commit

Permalink
Enabled explicitApi() (#28)
Browse files Browse the repository at this point in the history
* Added language=XML comment to enabled IDEA syntax highlighting

* Removed unused imports

* Preparation for explicitApi()

* Preparation for explicitApi()

* Enabled explicitApi()

* Fixed duplicated string

* Moved internal classes into dedicated package

* Moved internal classes into dedicated package

* Added missing ResourcePath.js.kt

* Imports organized

* XMPNode: Removed useless "public"

* Minor dependency update

* Removed copyright header

* Moved classes

* Bump version to v1.3.0

* XMPValueType can be private

* Improved QName.kt

* Detekt issues

* Detekt suppress
  • Loading branch information
StefanOltmann authored May 2, 2024
1 parent ada0b6d commit 9afa1c1
Show file tree
Hide file tree
Showing 250 changed files with 868 additions and 858 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ It's part of [Ashampoo Photo Organizer](https://ashampoo.com/photo-organizer).
## Installation

```
implementation("com.ashampoo:xmpcore:1.2.2")
implementation("com.ashampoo:xmpcore:1.3.0")
```

## How to use
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
Expand All @@ -14,7 +12,7 @@ plugins {
id("org.jetbrains.kotlinx.kover") version "0.6.1"
id("com.asarkar.gradle.build-time-tracker") version "4.3.0"
id("me.qoomon.git-versioning") version "6.4.3"
id("com.goncalossilva.resources") version "0.4.0"
id("com.goncalossilva.resources") version "0.4.1"
id("com.github.ben-manes.versions") version "0.51.0"
id("org.jetbrains.dokka") version "1.9.20"
}
Expand Down Expand Up @@ -111,6 +109,8 @@ dependencies {

kotlin {

explicitApi()

androidTarget {

compilations.all {
Expand Down
2 changes: 1 addition & 1 deletion detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ style:
RedundantHigherOrderMapUsage:
active: true
RedundantVisibilityModifierRule:
active: true
active: false # explicitApiMode
ReturnCount:
active: false # results in bad style
max: 2
Expand Down
2 changes: 1 addition & 1 deletion examples/xmpcore-java-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

dependencies {
implementation 'com.ashampoo:xmpcore:1.2.2'
implementation 'com.ashampoo:xmpcore:1.3.0'
}

// Needed to make it work for the Gradle java plugin
Expand Down
2 changes: 1 addition & 1 deletion examples/xmpcore-kotlin-jvm-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ repositories {
}

dependencies {
implementation("com.ashampoo:xmpcore:1.2.1")
implementation("com.ashampoo:xmpcore:1.3.0")
}
1 change: 1 addition & 0 deletions examples/xmpcore-kotlin-jvm-sample/src/main/kotlin/Main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ fun main() {
println("---")
println(xmp)

/* language=XML */
val oldXmp =
"""
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="">
Expand Down
51 changes: 0 additions & 51 deletions src/commonMain/kotlin/com/ashampoo/xmp/QName.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
// NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
// of the Adobe license agreement accompanying it.
// =================================================================================================
package com.ashampoo.xmp.properties
package com.ashampoo.xmp

import com.ashampoo.xmp.options.AliasOptions

/**
* This interface is used to return info about an alias.
*/
interface XMPAliasInfo {
public interface XMPAliasInfo {

/**
* @return Returns the namespace URI for the base property.
*/
fun getNamespace(): String
public fun getNamespace(): String

/**
* @return Returns the default prefix for the given base property.
*/
fun getPrefix(): String
public fun getPrefix(): String

/**
* @return Returns the path of the base property.
*/
fun getPropName(): String
public fun getPropName(): String

/**
* @return Returns the kind of the alias. This can be a direct alias
Expand All @@ -37,6 +37,6 @@ interface XMPAliasInfo {
* (ARRAY_ALTERNATE) or to an alternate text array
* (ARRAY_ALT_TEXT).
*/
fun getAliasForm(): AliasOptions
public fun getAliasForm(): AliasOptions

}
Loading

0 comments on commit 9afa1c1

Please sign in to comment.