Merge pull request #58 from skydoves/update/deps

Update AGP, Gradle, and several dependencies

app/api/app.api

@@ -17,13 +17,13 @@ public final class com/github/skydoves/colorpickercomposedemo/ComposableSingleto
 public final class com/github/skydoves/colorpickercomposedemo/ComposableSingletons$MainScreenKt {
 	public static final field INSTANCE Lcom/github/skydoves/colorpickercomposedemo/ComposableSingletons$MainScreenKt;
 	public static field lambda-1 Lkotlin/jvm/functions/Function2;
-	public static field lambda-2 Lkotlin/jvm/functions/Function3;
-	public static field lambda-3 Lkotlin/jvm/functions/Function3;
+	public static field lambda-2 Lkotlin/jvm/functions/Function4;
+	public static field lambda-3 Lkotlin/jvm/functions/Function4;
 	public static field lambda-4 Lkotlin/jvm/functions/Function3;
 	public fun <init> ()V
 	public final fun getLambda-1$app_release ()Lkotlin/jvm/functions/Function2;
-	public final fun getLambda-2$app_release ()Lkotlin/jvm/functions/Function3;
-	public final fun getLambda-3$app_release ()Lkotlin/jvm/functions/Function3;
+	public final fun getLambda-2$app_release ()Lkotlin/jvm/functions/Function4;
+	public final fun getLambda-3$app_release ()Lkotlin/jvm/functions/Function4;
 	public final fun getLambda-4$app_release ()Lkotlin/jvm/functions/Function3;
 }
 

app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/PhotoPickerIcon.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(BuildCompat.PrereleaseSdkCheck::class)
+
 package com.github.skydoves.colorpickercomposedemo
 
 import android.annotation.SuppressLint
@@ -34,6 +36,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import androidx.core.os.BuildCompat
 import com.github.skydoves.colorpicker.compose.ColorPickerController
 import com.google.modernstorage.photopicker.PhotoPicker
 

gradle/libs.versions.toml

@@ -1,24 +1,24 @@
 [versions]
-agp = "8.2.0"
+agp = "8.4.0"
 dokka = "1.9.10"
 nexusPlugin = "0.25.3"
-kotlin = "1.9.20"
-kotlinBinaryCompatibility = "0.13.2"
+kotlin = "1.9.23"
+kotlinBinaryCompatibility = "0.14.0"
 jvmTarget = "11"
-androidxComposeBom = "2023.10.01"
-androidxComposeCompiler = "1.5.5"
-androidxActivity = "1.7.2"
+androidxComposeBom = "2024.05.00"
+androidxComposeCompiler = "1.5.13"
+androidxActivity = "1.9.0"
 androidxTest = "1.5.2"
-androidxCore = "1.8.0"
-androidxNavigation = "2.6.0"
+androidxCore = "1.13.1"
+androidxNavigation = "2.7.7"
 photoPicker = "1.0.0-alpha06"
 baselineProfiles = "1.3.1"
-macroBenchmark = "1.2.2"
-uiAutomator = "2.3.0-alpha05"
+macroBenchmark = "1.2.4"
+uiAutomator = "2.3.0"
 spotless = "6.21.0"
 junit = "1.1.5"
 espresso-core = "3.5.1"
-androidxMacroBenchmark = "1.2.2"
+androidxMacroBenchmark = "1.2.4"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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,26 +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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ 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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail