A fully functional Android app built entirely with Kotlin and Jetpack Compose
Replace buildSrc with version catalog
Alex Vanyo42fa0e3a55a8
diff --git a/README.md b/README.mdindex 6509170b6..10257d9a2 100644--- a/README.md+++ b/README.md@@ -2,3 +2,5 @@ Now in Android App==================This is the repo for the Now in Android app.+TODOs:+- Add note about version catalogs for dependenciesdiff --git a/app/build.gradle b/app/build.gradleindex ae88808bb..5e7523c44 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -13,24 +13,20 @@* See the License for the specific language governing permissions and* limitations under the License.*/--import com.google.samples.apps.nowinandroid.buildsrc.Versions-import com.google.samples.apps.nowinandroid.buildsrc.Libs-plugins {id 'com.android.application'id 'kotlin-android'}android {- compileSdk Versions.compileSdk+ compileSdk buildConfig.compileSdkdefaultConfig {applicationId "com.google.samples.apps.nowinandroid"- minSdk Versions.minSdk- targetSdk Versions.targetSdk- versionCode Versions.versionCodeBase- versionName Versions.versionName+ minSdk buildConfig.minSdk+ targetSdk buildConfig.targetSdk+ versionCode 1+ versionName "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch leveltestInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"vectorDrawables {@@ -47,6 +43,7 @@ android {compileOptions {sourceCompatibility JavaVersion.VERSION_1_8targetCompatibility JavaVersion.VERSION_1_8+ coreLibraryDesugaringEnabled true}kotlinOptions {jvmTarget = '1.8'@@ -56,7 +53,7 @@ android {compose true}composeOptions {- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version+ kotlinCompilerExtensionVersion libs.versions.androidxCompose.get()}packagingOptions {resources {@@ -66,38 +63,42 @@ android {}dependencies {- implementation Libs.Coroutines.android+ coreLibraryDesugaring libs.android.desugarJdkLibs++ implementation libs.kotlinx.coroutines.android- implementation Libs.AndroidX.Activity.activityCompose- implementation Libs.AndroidX.coreKtx- implementation Libs.AndroidX.appcompat- implementation Libs.AndroidX.Lifecycle.viewModelCompose- implementation Libs.AndroidX.Navigation.fragment- implementation Libs.AndroidX.Navigation.uiKtx- implementation Libs.material3+ implementation libs.androidx.activity.compose+ implementation libs.androidx.core.ktx+ implementation libs.androidx.appcompat+ implementation libs.androidx.lifecycle.viewModelCompose+ implementation libs.androidx.navigation.fragment+ implementation libs.androidx.navigation.ui.ktx+ implementation libs.material3- implementation Libs.AndroidX.Compose.layout+ implementation libs.accompanist.insets++ implementation libs.androidx.compose.foundation.layout// TODO (M3): Remove this dependency when all components are available- implementation Libs.AndroidX.Compose.material- implementation Libs.AndroidX.Compose.Material3.material3- implementation Libs.AndroidX.Compose.tooling- implementation Libs.AndroidX.Compose.uiUtil- implementation Libs.AndroidX.Compose.runtime- implementation Libs.AndroidX.Compose.runtimeLivedata+ implementation libs.androidx.compose.material+ implementation libs.androidx.compose.material3+ implementation libs.androidx.compose.ui.tooling+ implementation libs.androidx.compose.ui.util+ implementation libs.androidx.compose.runtime+ implementation libs.androidx.compose.runtime.livedata- debugImplementation Libs.AndroidX.Compose.uiTestManifest+ debugImplementation libs.androidx.compose.ui.testManifest- androidTestImplementation Libs.junit- androidTestImplementation Libs.AndroidX.Test.core- androidTestImplementation Libs.AndroidX.Test.espressoCore- androidTestImplementation Libs.AndroidX.Test.rules- androidTestImplementation Libs.AndroidX.Test.Ext.junit- androidTestImplementation Libs.AndroidX.Compose.uiTest+ androidTestImplementation libs.junit4+ androidTestImplementation libs.androidx.test.core+ androidTestImplementation libs.androidx.test.espresso.core+ androidTestImplementation libs.androidx.test.ext.junit+ androidTestImplementation libs.androidx.test.rules+ androidTestImplementation libs.androidx.compose.ui.test// androidx.test is forcing JUnit, 4.12. This forces it to use 4.13configurations.configureEach {resolutionStrategy {- force Libs.junit+ force libs.junit4}}-}\ No newline at end of file+}diff --git a/build.gradle b/build.gradleindex 1eb4ac4d5..61a7ccb64 100644--- a/build.gradle+++ b/build.gradle@@ -16,24 +16,27 @@// Top-level build file where you can add configuration options common to all sub-projects/modules.-import com.google.samples.apps.nowinandroid.buildsrc.Libs-import com.google.samples.apps.nowinandroid.buildsrc.Versions-buildscript {+ ext.buildConfig = [+ 'compileSdk': 31,+ 'minSdk' : 21,+ 'targetSdk' : 31,+ ]+repositories {google()mavenCentral()}dependencies {- classpath Libs.androidGradlePlugin- classpath Libs.Kotlin.gradlePlugin+ classpath(libs.android.gradlePlugin)+ classpath(libs.kotlin.gradlePlugin)}}plugins {- id 'com.diffplug.spotless' version '6.0.0'+ alias(libs.plugins.spotless)}subprojects {@@ -44,7 +47,7 @@ subprojects {target '**/*.kt'targetExclude("$buildDir/**/*.kt")targetExclude('bin/**/*.kt')- ktlint(Versions.ktlint).userData([android: "true"])+ ktlint(libs.versions.ktlint.get()).userData([android: "true"])licenseHeaderFile rootProject.file('spotless/copyright.kt')}}@@ -65,4 +68,4 @@ subprojects {jvmTarget = "1.8"}}-}\ No newline at end of file+}diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.ktsdeleted file mode 100644index 5c9e163ca..000000000--- a/buildSrc/build.gradle.kts+++ /dev/null@@ -1,23 +0,0 @@-/*- * Copyright 2020 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--repositories {- mavenCentral()-}--plugins {- `kotlin-dsl`-}diff --git a/buildSrc/src/main/java/com/google/samples/apps/nowinandroid/buildsrc/dependencies.kt b/buildSrc/src/main/java/com/google/samples/apps/nowinandroid/buildsrc/dependencies.ktdeleted file mode 100644index b3220cca6..000000000--- a/buildSrc/src/main/java/com/google/samples/apps/nowinandroid/buildsrc/dependencies.kt+++ /dev/null@@ -1,116 +0,0 @@-/*- * Copyright 2020 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.buildsrc--object Versions {-- const val versionName = "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level- const val versionCodeBase = 1 // XYYZZM; M = Module (tv, mobile)- val versionCodeMobile = versionCodeBase + 3-- const val compileSdk = 31- const val targetSdk = 31- const val minSdk = 21-- const val ktlint = "0.43.0"-}--object Libs {- const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"- const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"-- const val junit = "junit:junit:4.13"-- const val material3 = "com.google.android.material:material:1.5.0-alpha05"-- object Accompanist {- const val version = "0.21.4-beta"- const val insets = "com.google.accompanist:accompanist-insets:$version"- }-- object Kotlin {- private const val version = "1.6.0"- const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"- const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"- const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"- }-- object Coroutines {- private const val version = "1.5.2"- const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"- const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"- const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"- }-- object AndroidX {- const val appcompat = "androidx.appcompat:appcompat:1.3.0"- const val coreKtx = "androidx.core:core-ktx:1.7.0"-- object Activity {- const val activityCompose = "androidx.activity:activity-compose:1.4.0"- }-- object Compose {- const val snapshot = ""- const val version = "1.1.0-beta04"-- const val foundation = "androidx.compose.foundation:foundation:$version"- const val layout = "androidx.compose.foundation:foundation-layout:$version"- const val material = "androidx.compose.material:material:$version"- const val runtime = "androidx.compose.runtime:runtime:$version"- const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"- const val tooling = "androidx.compose.ui:ui-tooling:$version"- const val test = "androidx.compose.ui:ui-test:$version"- const val uiTest = "androidx.compose.ui:ui-test-junit4:$version"- const val uiTestManifest = "androidx.compose.ui:ui-test-manifest:$version"- const val uiUtil = "androidx.compose.ui:ui-util:${version}"-- object Material3 {- const val snapshot = ""- const val version = "1.0.0-alpha01"-- const val material3 = "androidx.compose.material3:material3:$version"- }- }-- object Navigation {- private const val version = "2.3.5"- const val fragment = "androidx.navigation:navigation-fragment-ktx:$version"- const val uiKtx = "androidx.navigation:navigation-ui-ktx:$version"- }-- object Test {- private const val version = "1.4.0"- const val core = "androidx.test:core:$version"- const val rules = "androidx.test:rules:$version"-- object Ext {- private const val version = "1.1.2"- const val junit = "androidx.test.ext:junit-ktx:$version"- }-- const val espressoCore = "androidx.test.espresso:espresso-core:3.3.0"- }-- object Lifecycle {- private const val version = "2.4.0"- const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"- const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"- const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"- }- }-}\ No newline at end of filediff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlnew file mode 100644index 000000000..0417b9519--- /dev/null+++ b/gradle/libs.versions.toml@@ -0,0 +1,51 @@+[versions]+accompanist = "0.21.4-beta"+androidDesugarJdkLibs = "1.1.5"+androidGradlePlugin = "7.0.3"+androidxActivity = "1.4.0"+androidxAppCompat = "1.3.0"+androidxCompose = "1.1.0-beta04"+androidxComposeMaterial3 = "1.0.0-alpha01"+androidxCore = "1.7.0"+androidxEspresso = "3.3.0"+androidxLifecycle = "2.4.0"+androidxNavigation = "2.3.5"+androidxTest = "1.4.0"+androidxTestExt = "1.1.2"+junit4 = "4.13"+kotlin = "1.6.0"+kotlinxCoroutines = "1.5.2"+ktlint = "0.43.0"+material3 = "1.5.0-alpha05"+spotless = "6.0.0"++[libraries]+accompanist-insets = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" }+android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }+android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }+androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout", version.ref = "androidxCompose" }+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidxCompose" }+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidxCompose" }+androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "androidxCompose" }+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" }+androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" }+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }+androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "androidxCompose" }+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }+androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" }+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "androidxNavigation" }+androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "androidxNavigation" }+androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" }+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" }+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" }+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }+junit4 = { group = "junit", name = "junit", version.ref = "junit4" }+kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }+kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }+material3 = { group = "com.google.android.material", name = "material", version.ref = "material3" }++[plugins]+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jarindex e708b1c02..7454180f2 100644Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex f6fe1cfa0..84d1f85fd 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,5 @@-#Thu Dec 02 22:36:21 GMT 2021distributionBase=GRADLE_USER_HOME-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zipdistributionPath=wrapper/dists-zipStorePath=wrapper/dists+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zipzipStoreBase=GRADLE_USER_HOME+zipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 4f906e0c8..1b6c78733 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@-#!/usr/bin/env sh+#!/bin/sh#-# Copyright 2015 the original author or authors.+# Copyright © 2015-2021 the original authors.## Licensed under the Apache License, Version 2.0 (the "License");# you may not use this file except in compliance with the License.@@ -17,67 +17,101 @@###############################################################################-##-## Gradle start up script for UN*X-##+#+# Gradle start up script for POSIX generated by Gradle.+#+# Important for running:+#+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is+# noncompliant, but you have some other compliant shell such as ksh or+# bash, then to run this script, type that shell name before the whole+# command line, like:+#+# ksh Gradle+#+# Busybox and similar reduced shells will NOT work, because this script+# requires all of these POSIX shell features:+# * functions;+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;+# * compound commands having a testable exit status, especially «case»;+# * various built-in commands including «command», «set», and «ulimit».+#+# Important for patching:+#+# (2) This script targets any POSIX shell, so it avoids extensions provided+# by Bash, Ksh, etc; in particular arrays are avoided.+#+# The "traditional" practice of packing multiple parameters into a+# space-separated string is a well documented source of bugs and security+# problems, so this is (mostly) avoided, by progressively accumulating+# options in "$@", and eventually passing that to Java.+#+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;+# see the in-line comments for details.+#+# There are tweaks for specific operating systems such as AIX, CygWin,+# 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+# within the Gradle project.+#+# You can find Gradle at https://github.com/gradle/gradle/.+################################################################################ Attempt to set APP_HOME+# Resolve links: $0 may be a link-PRG="$0"-# Need this for relative symlinks.-while [ -h "$PRG" ] ; do- ls=`ls -ld "$PRG"`- link=`expr "$ls" : '.*-> \(.*\)$'`- if expr "$link" : '/.*' > /dev/null; then- PRG="$link"- else- PRG=`dirname "$PRG"`"/$link"- fi+app_path=$0++# Need this for daisy-chained symlinks.+while+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path+ [ -h "$app_path" ]+do+ ls=$( ls -ld "$app_path" )+ link=${ls#*' -> '}+ case $link in #(+ /*) app_path=$link ;; #(+ *) app_path=$APP_HOME$link ;;+ esacdone-SAVED="`pwd`"-cd "`dirname \"$PRG\"`/" >/dev/null-APP_HOME="`pwd -P`"-cd "$SAVED" >/dev/null++APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exitAPP_NAME="Gradle"-APP_BASE_NAME=`basename "$0"`+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"'# Use the maximum available, or set MAX_FD != -1 to use that value.-MAX_FD="maximum"+MAX_FD=maximumwarn () {echo "$*"-}+} >&2die () {echoecho "$*"echoexit 1-}+} >&2# OS specific support (must be 'true' or 'false').cygwin=falsemsys=falsedarwin=falsenonstop=false-case "`uname`" in- CYGWIN* )- cygwin=true- ;;- Darwin* )- darwin=true- ;;- MINGW* )- msys=true- ;;- NONSTOP* )- nonstop=true- ;;+case "$( uname )" in #(+ CYGWIN* ) cygwin=true ;; #(+ Darwin* ) darwin=true ;; #(+ MSYS* | MINGW* ) msys=true ;; #(+ NONSTOP* ) nonstop=true ;;esacCLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jarif [ -n "$JAVA_HOME" ] ; thenif [ -x "$JAVA_HOME/jre/sh/java" ] ; then# IBM's JDK on AIX uses strange locations for the executables- JAVACMD="$JAVA_HOME/jre/sh/java"+ JAVACMD=$JAVA_HOME/jre/sh/javaelse- JAVACMD="$JAVA_HOME/bin/java"+ JAVACMD=$JAVA_HOME/bin/javafiif [ ! -x "$JAVACMD" ] ; thendie "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match thelocation of your Java installation."fielse- JAVACMD="java"+ JAVACMD=javawhich java >/dev/null 2>&1 || 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@@ -106,80 +140,95 @@ location of your Java installation."fi# Increase the maximum file descriptors if we can.-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then- MAX_FD_LIMIT=`ulimit -H -n`- if [ $? -eq 0 ] ; then- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then- MAX_FD="$MAX_FD_LIMIT"- fi- ulimit -n $MAX_FD- if [ $? -ne 0 ] ; then- warn "Could not set maximum file descriptor limit: $MAX_FD"- fi- else- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"- fi+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then+ case $MAX_FD in #(+ max*)+ MAX_FD=$( ulimit -H -n ) ||+ warn "Could not query maximum file descriptor limit"+ esac+ case $MAX_FD in #(+ '' | soft) :;; #(+ *)+ ulimit -n "$MAX_FD" ||+ warn "Could not set maximum file descriptor limit to $MAX_FD"+ esacfi-# For Darwin, add options to specify how the application appears in the dock-if $darwin; then- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""-fi+# Collect all arguments for the java command, stacking in reverse order:+# * args from the command line+# * the main class name+# * -classpath+# * -D...appname settings+# * --module-path (only if needed)+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.# For Cygwin or MSYS, switch paths to Windows format before running java-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then- APP_HOME=`cygpath --path --mixed "$APP_HOME"`- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`-- JAVACMD=`cygpath --unix "$JAVACMD"`-- # We build the pattern for arguments to be converted via cygpath- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`- SEP=""- for dir in $ROOTDIRSRAW ; do- ROOTDIRS="$ROOTDIRS$SEP$dir"- SEP="|"- done- OURCYGPATTERN="(^($ROOTDIRS))"- # Add a user-defined pattern to the cygpath arguments- if [ "$GRADLE_CYGPATTERN" != "" ] ; then- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"- fi+if "$cygwin" || "$msys" ; then+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )++ JAVACMD=$( cygpath --unix "$JAVACMD" )+# Now convert the arguments - kludge to limit ourselves to /bin/sh- i=0- for arg in "$@" ; do- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option-- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`- else- eval `echo args$i`="\"$arg\""+ for arg do+ if+ case $arg in #(+ -*) false ;; # don't mess with options #(+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath+ [ -e "$t" ] ;; #(+ *) false ;;+ esac+ then+ arg=$( cygpath --path --ignore --mixed "$arg" )fi- i=`expr $i + 1`+ # Roll the args list around exactly as many times as the number of+ # args, so each arg winds up back in the position where it started, but+ # possibly modified.+ #+ # NB: a `for` loop captures its iteration list before it begins, so+ # changing the positional parameters here affects neither the number of+ # iterations, nor the values presented in `arg`.+ shift # remove old arg+ set -- "$@" "$arg" # push replacement argdone- case $i in- 0) set -- ;;- 1) set -- "$args0" ;;- 2) set -- "$args0" "$args1" ;;- 3) set -- "$args0" "$args1" "$args2" ;;- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;- esacfi-# Escape application args-save () {- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done- echo " "-}-APP_ARGS=`save "$@"`+# 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.++set -- \+ "-Dorg.gradle.appname=$APP_BASE_NAME" \+ -classpath "$CLASSPATH" \+ org.gradle.wrapper.GradleWrapperMain \+ "$@"++# Use "xargs" to parse quoted args.+#+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.+#+# In Bash we could simply go:+#+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&+# set -- "${ARGS[@]}" "$@"+#+# but POSIX shell has neither arrays nor command substitution, so instead we+# post-process each arg (as a line of input to sed) to backslash-escape any+# character that might be a shell metacharacter, then use eval to reverse+# that process (while maintaining the separation between arguments), and wrap+# the whole thing up as a single "set" statement.+#+# This will of course break if any of these variables contains a newline or+# an unmatched quote.+#-# Collect all arguments for the java command, following the shell quoting and substitution rules-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"+eval "set -- $(+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |+ xargs -n1 |+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |+ tr '\n' ' '+ )" '"$@"'exec "$JAVACMD" "$@"diff --git a/settings.gradle b/settings.gradleindex 58aa9fa2c..676708897 100644--- a/settings.gradle+++ b/settings.gradle@@ -14,6 +14,10 @@* limitations under the License.*/+// Use version catalogs for managing dependencies+// https://docs.gradle.org/current/userguide/platforms.html+enableFeaturePreview("VERSION_CATALOGS")+dependencyResolutionManagement {repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)repositories {