Update to 03336bf

README.md

@@ -13,7 +13,7 @@ allprojects {
     }
 }
 
-implementation("com.github.Kyant0:m3color:2024.4")
+implementation("com.github.Kyant0:m3color:<version>")
 ```
 
 ## Use with Compose M3
@@ -128,6 +128,6 @@ enum class PaletteStyle {
     FruitSalad,
     Monochrome,
     Fidelity,
-    Content
+    Content,
 }
 ```

jitpack.yml

@@ -1,2 +1,2 @@
 jdk:
-  - openjdk17
+  - openjdk21

m3color/build.gradle

@@ -4,19 +4,19 @@ plugins {
 }
 
 group = 'com.kyant'
-version = '2024.4'
+version = '2024.5'
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 repositories {
     google()
     mavenCentral()
 }
 
 dependencies {
-    implementation('androidx.annotation:annotation:1.8.0')
-    implementation('com.google.errorprone:error_prone_annotations:2.28.0')
+    implementation('androidx.annotation:annotation:1.8.2')
+    implementation('com.google.errorprone:error_prone_annotations:2.30.0')
 }
 
 afterEvaluate {
@@ -25,9 +25,9 @@ afterEvaluate {
             maven(MavenPublication) {
                 groupId = 'com.kyant'
                 artifactId = 'm3color'
-                version = '2024.4'
+                version = '2024.5'
                 from components.java
             }
         }
     }
-}
+}

m3color/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

m3color/src/main/java/com/kyant/m3color/blend/Blend.java

@@ -23,69 +23,72 @@
 import com.kyant.m3color.utils.ColorUtils;
 import com.kyant.m3color.utils.MathUtils;
 
-/** Functions for blending in HCT and CAM16. */
+/**
+ * Functions for blending in HCT and CAM16.
+ */
 public class Blend {
-  private Blend() {}
+    private Blend() {
+    }
 
-  /**
-   * Blend the design color's HCT hue towards the key color's HCT hue, in a way that leaves the
-   * original color recognizable and recognizably shifted towards the key color.
-   *
-   * @param designColor ARGB representation of an arbitrary color.
-   * @param sourceColor ARGB representation of the main theme color.
-   * @return The design color with a hue shifted towards the system's color, a slightly
-   *     warmer/cooler variant of the design color's hue.
-   */
-  public static int harmonize(int designColor, int sourceColor) {
-    Hct fromHct = Hct.fromInt(designColor);
-    Hct toHct = Hct.fromInt(sourceColor);
-    double differenceDegrees = MathUtils.differenceDegrees(fromHct.getHue(), toHct.getHue());
-    double rotationDegrees = Math.min(differenceDegrees * 0.5, 15.0);
-    double outputHue =
-        MathUtils.sanitizeDegreesDouble(
-            fromHct.getHue()
-                + rotationDegrees * MathUtils.rotationDirection(fromHct.getHue(), toHct.getHue()));
-    return Hct.from(outputHue, fromHct.getChroma(), fromHct.getTone()).toInt();
-  }
+    /**
+     * Blend the design color's HCT hue towards the key color's HCT hue, in a way that leaves the
+     * original color recognizable and recognizably shifted towards the key color.
+     *
+     * @param designColor ARGB representation of an arbitrary color.
+     * @param sourceColor ARGB representation of the main theme color.
+     * @return The design color with a hue shifted towards the system's color, a slightly
+     * warmer/cooler variant of the design color's hue.
+     */
+    public static int harmonize(int designColor, int sourceColor) {
+        Hct fromHct = Hct.fromInt(designColor);
+        Hct toHct = Hct.fromInt(sourceColor);
+        double differenceDegrees = MathUtils.differenceDegrees(fromHct.getHue(), toHct.getHue());
+        double rotationDegrees = Math.min(differenceDegrees * 0.5, 15.0);
+        double outputHue =
+                MathUtils.sanitizeDegreesDouble(
+                        fromHct.getHue()
+                                + rotationDegrees * MathUtils.rotationDirection(fromHct.getHue(), toHct.getHue()));
+        return Hct.from(outputHue, fromHct.getChroma(), fromHct.getTone()).toInt();
+    }
 
-  /**
-   * Blends hue from one color into another. The chroma and tone of the original color are
-   * maintained.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, with a hue blended towards to. Chroma and tone are constant.
-   */
-  public static int hctHue(int from, int to, double amount) {
-    int ucs = cam16Ucs(from, to, amount);
-    Cam16 ucsCam = Cam16.fromInt(ucs);
-    Cam16 fromCam = Cam16.fromInt(from);
-    Hct blended = Hct.from(ucsCam.getHue(), fromCam.getChroma(), ColorUtils.lstarFromArgb(from));
-    return blended.toInt();
-  }
+    /**
+     * Blends hue from one color into another. The chroma and tone of the original color are
+     * maintained.
+     *
+     * @param from   ARGB representation of color
+     * @param to     ARGB representation of color
+     * @param amount how much blending to perform; 0.0 >= and <= 1.0
+     * @return from, with a hue blended towards to. Chroma and tone are constant.
+     */
+    public static int hctHue(int from, int to, double amount) {
+        int ucs = cam16Ucs(from, to, amount);
+        Cam16 ucsCam = Cam16.fromInt(ucs);
+        Cam16 fromCam = Cam16.fromInt(from);
+        Hct blended = Hct.from(ucsCam.getHue(), fromCam.getChroma(), ColorUtils.lstarFromArgb(from));
+        return blended.toInt();
+    }
 
-  /**
-   * Blend in CAM16-UCS space.
-   *
-   * @param from ARGB representation of color
-   * @param to ARGB representation of color
-   * @param amount how much blending to perform; 0.0 >= and <= 1.0
-   * @return from, blended towards to. Hue, chroma, and tone will change.
-   */
-  public static int cam16Ucs(int from, int to, double amount) {
-    Cam16 fromCam = Cam16.fromInt(from);
-    Cam16 toCam = Cam16.fromInt(to);
-    double fromJ = fromCam.getJstar();
-    double fromA = fromCam.getAstar();
-    double fromB = fromCam.getBstar();
-    double toJ = toCam.getJstar();
-    double toA = toCam.getAstar();
-    double toB = toCam.getBstar();
-    double jstar = fromJ + (toJ - fromJ) * amount;
-    double astar = fromA + (toA - fromA) * amount;
-    double bstar = fromB + (toB - fromB) * amount;
-    return Cam16.fromUcs(jstar, astar, bstar).toInt();
-  }
+    /**
+     * Blend in CAM16-UCS space.
+     *
+     * @param from   ARGB representation of color
+     * @param to     ARGB representation of color
+     * @param amount how much blending to perform; 0.0 >= and <= 1.0
+     * @return from, blended towards to. Hue, chroma, and tone will change.
+     */
+    public static int cam16Ucs(int from, int to, double amount) {
+        Cam16 fromCam = Cam16.fromInt(from);
+        Cam16 toCam = Cam16.fromInt(to);
+        double fromJ = fromCam.getJstar();
+        double fromA = fromCam.getAstar();
+        double fromB = fromCam.getBstar();
+        double toJ = toCam.getJstar();
+        double toA = toCam.getAstar();
+        double toB = toCam.getBstar();
+        double jstar = fromJ + (toJ - fromJ) * amount;
+        double astar = fromA + (toA - fromA) * amount;
+        double bstar = fromB + (toB - fromB) * amount;
+        return Cam16.fromUcs(jstar, astar, bstar).toInt();
+    }
 }