Fix: Duplicate annotation classes (#25)

jordond · Oct 2, 2023 · 6cd0964 · 6cd0964
1 parent c19d618
commit 6cd0964
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Palette.kt b/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Palette.kt
@@ -15,11 +15,11 @@
  */
 package androidx.palette.graphics
 
-import androidx.annotation.ColorInt
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.palette.graphics.Palette.Builder
 import com.kmpalette.palette.internal.ColorCutQuantizer
+import com.kmpalette.palette.internal.annotation.ColorInt
 import com.kmpalette.palette.internal.scale
 import com.kmpalette.palette.internal.utils.ColorUtils
 import dev.drewhamilton.poko.Poko

diff --git a/...in/kotlin/androidx/annotation/ColorInt.kt → ...e/palette/internal/annotation/ColorInt.kt b/...in/kotlin/androidx/annotation/ColorInt.kt → ...e/palette/internal/annotation/ColorInt.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.annotation
+package com.kmpalette.palette.internal.annotation
 
 @Retention(AnnotationRetention.BINARY)
 @Target(

diff --git a/.../kotlin/androidx/annotation/FloatRange.kt → ...palette/internal/annotation/FloatRange.kt b/.../kotlin/androidx/annotation/FloatRange.kt → ...palette/internal/annotation/FloatRange.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.annotation
+package com.kmpalette.palette.internal.annotation
 
 /**
  * Denotes that the annotated element should be a float or double in the given range

diff --git a/...in/kotlin/androidx/annotation/IntRange.kt → ...e/palette/internal/annotation/IntRange.kt b/...in/kotlin/androidx/annotation/IntRange.kt → ...e/palette/internal/annotation/IntRange.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.annotation
+package com.kmpalette.palette.internal.annotation
 
 @Retention(AnnotationRetention.BINARY)
 @Target(

diff --git a/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/utils/ColorUtils.kt b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/utils/ColorUtils.kt
@@ -1,8 +1,8 @@
 package com.kmpalette.palette.internal.utils
 
-import androidx.annotation.ColorInt
-import androidx.annotation.FloatRange
-import androidx.annotation.IntRange
+import com.kmpalette.palette.internal.annotation.ColorInt
+import com.kmpalette.palette.internal.annotation.FloatRange
+import com.kmpalette.palette.internal.annotation.IntRange
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min