[12b75a0] Internal change.

Kyant0 · Oct 4, 2023 · 49c9352 · 49c9352
1 parent eaa1e34
commit 49c9352
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 62 deletions.
diff --git a/...nnotation_annotation_jvm_1_7_0_beta01.xml → ...roidx_annotation_annotation_jvm_1_7_0.xml b/...nnotation_annotation_jvm_1_7_0_beta01.xml → ...roidx_annotation_annotation_jvm_1_7_0.xml
diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_18_0.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_18_0.xml
diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_22_0.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_22_0.xml
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_7_10.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_7_10.xml
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_10.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_7_10.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules/m3color.iml b/.idea/modules/m3color.iml
diff --git a/.idea/modules/m3color.main.iml b/.idea/modules/m3color.main.iml
diff --git a/.idea/modules/m3color.test.iml b/.idea/modules/m3color.test.iml
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ allprojects {
     }
 }
 
-implementation("com.github.Kyant0:m3color:2023.8.1")
+implementation("com.github.Kyant0:m3color:2023.10.1")
 ```
 
 ## Use with Compose M3
@@ -65,8 +65,8 @@ fun dynamicColorScheme(
         PaletteStyle.Neutral -> SchemeNeutral(hct, isDark, contrastLevel)
         PaletteStyle.Vibrant -> SchemeVibrant(hct, isDark, contrastLevel)
         PaletteStyle.Expressive -> SchemeExpressive(hct, isDark, contrastLevel)
-        PaletteStyle.Rainbow -> SchemeRainbow(hct, isDark, contrast)
-        PaletteStyle.FruitSalad -> SchemeFruitSalad(hct, isDark, contrast)
+        PaletteStyle.Rainbow -> SchemeRainbow(hct, isDark, contrastLevel)
+        PaletteStyle.FruitSalad -> SchemeFruitSalad(hct, isDark, contrastLevel)
         PaletteStyle.Monochrome -> SchemeMonochrome(hct, isDark, contrastLevel)
         PaletteStyle.Fidelity -> SchemeFidelity(hct, isDark, contrastLevel)
         PaletteStyle.Content -> SchemeContent(hct, isDark, contrastLevel)

diff --git a/m3color/build.gradle b/m3color/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.kyant'
-version = '2023.8.1'
+version = '2023.10.1'
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
@@ -15,8 +15,8 @@ repositories {
 }
 
 dependencies {
-    implementation('androidx.annotation:annotation:1.7.0-beta01')
-    implementation('com.google.errorprone:error_prone_annotations:2.18.0')
+    implementation('androidx.annotation:annotation:1.7.0')
+    implementation('com.google.errorprone:error_prone_annotations:2.22.0')
 }
 
 afterEvaluate {
@@ -25,7 +25,7 @@ afterEvaluate {
             maven(MavenPublication) {
                 groupId = 'com.kyant'
                 artifactId = 'm3color'
-                version = '2023.8.1'
+                version = '2023.10.1'
                 from components.java
             }
         }

diff --git a/m3color/src/main/java/com/kyant/m3color/hct/Cam16.java b/m3color/src/main/java/com/kyant/m3color/hct/Cam16.java
@@ -71,7 +71,7 @@ public final class Cam16 {
    * astar, bstar in code. CAM16-UCS is included in the CAM16 specification, and is used to measure
    * distances between colors.
    */
-  double distance(Cam16 other) {
+  public double distance(Cam16 other) {
     double dJ = getJstar() - other.getJstar();
     double dA = getAstar() - other.getAstar();
     double dB = getBstar() - other.getBstar();