Merge branch 'main' into cb/child-parent

# Conflicts: # gradle/libs.versions.toml # haze-jetpack-compose/api/api.txt # haze/api/api.txt
chrisbanes · Dec 7, 2023 · 9fad7a6 · 9fad7a6
2 parents 67398e0 + c64f7e5
commit 9fad7a6
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 92 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 20
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 20

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -21,18 +21,18 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
 
       - name: Install dependencies
         run: |
@@ -56,4 +56,4 @@ jobs:
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v3
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx5g -Dfile.encoding=UTF-8
 
 # https://docs.gradle.org/7.6/userguide/configuration_cache.html
-org.gradle.configuration-cache=false
+org.gradle.configuration-cache=true
+org.gradle.unsafe.configuration-cache-problems=warn
 
 # AndroidX
 android.useAndroidX=true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-agp = "8.1.3"
-jetpackcompose-compiler = "1.5.3"
-compose-multiplatform = "1.5.3"
+agp = "8.2.0"
+jetpackcompose-compiler = "1.5.4"
+compose-multiplatform = "1.5.11"
 ktlint = "1.0.1"
-kotlin = "1.9.10"
-spotless = "6.22.0"
+kotlin = "1.9.20"
+spotless = "6.23.3"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -15,16 +15,16 @@ cacheFixPlugin = { id = "org.gradle.android.cache-fix", version = "3.0" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-metalava = { id = "me.tylerbwong.gradle.metalava", version = "0.3.3" }
+metalava = { id = "me.tylerbwong.gradle.metalava", version = "0.3.5" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 mavenpublish = { id = "com.vanniktech.maven.publish", version = "0.25.3" }
 
 [libraries]
 imageloader = "io.github.qdsfdhvh:image-loader:1.6.8"
-androidx-compose-ui = "androidx.compose.ui:ui:1.6.0-beta01"
+androidx-compose-ui = "androidx.compose.ui:ui:1.6.0-beta02"
 androidx-compose-material3 = "androidx.compose.material3:material3:1.1.2"
 androidx-core = "androidx.core:core-ktx:1.12.0"
-androidx-activity-compose = "androidx.activity:activity-compose:1.8.0"
+androidx-activity-compose = "androidx.activity:activity-compose:1.8.1"
 
 # Build logic dependencies
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/haze-jetpack-compose/api/api.txt b/haze-jetpack-compose/api/api.txt
@@ -1,20 +1,6 @@
 // Signature format: 4.0
 package dev.chrisbanes.haze {
 
-  @androidx.compose.runtime.Stable public final class HazeArea {
-    ctor public HazeArea();
-    method public androidx.compose.ui.geometry.Rect getBounds();
-    method public androidx.compose.ui.graphics.Shape getShape();
-    method public boolean isEmpty();
-    property public final androidx.compose.ui.geometry.Rect bounds;
-    property public final boolean isEmpty;
-    property public final androidx.compose.ui.graphics.Shape shape;
-  }
-
-  public final class HazeChildKt {
-    method public static androidx.compose.ui.Modifier hazeChild(androidx.compose.ui.Modifier, Object key, dev.chrisbanes.haze.HazeState state, optional androidx.compose.ui.graphics.Shape shape);
-  }
-
   public final class HazeDefaults {
     method public float getBlurRadius();
     method public float getTintAlpha();
@@ -26,20 +12,9 @@ package dev.chrisbanes.haze {
   }
 
   public final class HazeKt {
-    method public static androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, dev.chrisbanes.haze.HazeState state, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
-  }
-
-  public final class HazeNode31Kt {
-  }
-
-  @androidx.compose.runtime.Stable public final class HazeState {
-    ctor public HazeState();
-    method public java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> getAreas();
-    method public void updateArea(Object key, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Shape shape);
-    property public final java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> areas;
-  }
-
-  public final class PlatformKt {
+    method public static inline androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, androidx.compose.ui.geometry.Rect![] area, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
+    method public static inline androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, androidx.compose.ui.geometry.RoundRect![] area, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
+    method public static androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, java.util.List<androidx.compose.ui.geometry.RoundRect> areas, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
   }
 
 }

diff --git a/haze/api/api.txt b/haze/api/api.txt
@@ -1,20 +1,6 @@
 // Signature format: 4.0
 package dev.chrisbanes.haze {
 
-  @androidx.compose.runtime.Stable public final class HazeArea {
-    ctor public HazeArea();
-    method public androidx.compose.ui.geometry.Rect getBounds();
-    method public androidx.compose.ui.graphics.Shape getShape();
-    method public boolean isEmpty();
-    property public final androidx.compose.ui.geometry.Rect bounds;
-    property public final boolean isEmpty;
-    property public final androidx.compose.ui.graphics.Shape shape;
-  }
-
-  public final class HazeChildKt {
-    method public static androidx.compose.ui.Modifier hazeChild(androidx.compose.ui.Modifier, Object key, dev.chrisbanes.haze.HazeState state, optional androidx.compose.ui.graphics.Shape shape);
-  }
-
   public final class HazeDefaults {
     method public float getBlurRadius();
     method public float getTintAlpha();
@@ -26,20 +12,9 @@ package dev.chrisbanes.haze {
   }
 
   public final class HazeKt {
-    method public static androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, dev.chrisbanes.haze.HazeState state, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
-  }
-
-  public final class HazeNodeKt {
-  }
-
-  @androidx.compose.runtime.Stable public final class HazeState {
-    ctor public HazeState();
-    method public java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> getAreas();
-    method public void updateArea(Object key, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Shape shape);
-    property public final java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> areas;
-  }
-
-  public final class PlatformKt {
+    method public static inline androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, androidx.compose.ui.geometry.Rect![] area, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
+    method public static inline androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, androidx.compose.ui.geometry.RoundRect![] area, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
+    method public static androidx.compose.ui.Modifier haze(androidx.compose.ui.Modifier, java.util.List<androidx.compose.ui.geometry.RoundRect> areas, long backgroundColor, optional long tint, optional float blurRadius, optional float noiseFactor);
   }
 
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,7 +21,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.enterprise") version "3.15.1"
+  id("com.gradle.enterprise") version "3.16"
 }
 
 val isCi = providers.environmentVariable("CI").isPresent