diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 49ab6f791..9a3d1d7f7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -160,7 +160,7 @@ val genericImplementation by configurations val googleplayImplementation by configurations dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.0") implementation("com.github.bitfireAT:dav4jvm:2.2") { exclude(group = "junit") } diff --git a/build.gradle.kts b/build.gradle.kts index d593a50c6..b784e7e83 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.android.tools.build:gradle:7.4.0-beta05") classpath("com.google.gms:google-services:4.3.14") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") @@ -15,6 +15,6 @@ buildscript { } tasks.getByName("wrapper") { - gradleVersion = "7.4.2" + gradleVersion = "7.5" distributionType = Wrapper.DistributionType.ALL } diff --git a/deps_fdroid.txt b/deps_fdroid.txt index cb03d0c7a..9562e4969 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,14 +1,14 @@ -++--- androidx.databinding:viewbinding:7.3.1 +++--- androidx.databinding:viewbinding:7.4.0-beta05 +| \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.3.1 -++--- androidx.databinding:databinding-runtime:7.3.1 +++--- androidx.databinding:databinding-common:7.4.0-beta05 +++--- androidx.databinding:databinding-runtime:7.4.0-beta05 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| +--- androidx.databinding:databinding-common:7.3.1 -+| +--- androidx.databinding:viewbinding:7.3.1 (*) ++| +--- androidx.databinding:databinding-common:7.4.0-beta05 ++| +--- androidx.databinding:viewbinding:7.4.0-beta05 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.1 (c) -++--- androidx.databinding:databinding-adapters:7.3.1 -+| +--- androidx.databinding:databinding-runtime:7.3.1 (*) -+| \--- androidx.databinding:databinding-common:7.3.1 -++--- androidx.databinding:databinding-ktx:7.3.1 +++--- androidx.databinding:databinding-adapters:7.4.0-beta05 ++| +--- androidx.databinding:databinding-runtime:7.4.0-beta05 (*) ++| \--- androidx.databinding:databinding-common:7.4.0-beta05 +++--- androidx.databinding:databinding-ktx:7.4.0-beta05 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 @@ -62,8 +62,8 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.20 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.3.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.20 (*) ++| +--- androidx.databinding:databinding-runtime:7.4.0-beta05 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.7.20 (*) ++--- com.github.bitfireAT:dav4jvm:2.2 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 (*) +| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 @@ -118,10 +118,10 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) +| \--- androidx.core:core:1.9.0 (c) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.3.1 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.3.1 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.3.1 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.3.1 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-beta05 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-beta05 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-beta05 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-rc01 +| | +--- androidx.activity:activity:1.6.0-rc02 -> 1.6.1 @@ -629,7 +629,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.3.1 +| +--- androidx.compose.ui:ui:1.3.1 (*) +| +--- androidx.compose.ui:ui-util:1.3.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.3.1 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-beta05 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.4 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) ++--- io.coil-kt:coil-compose:2.2.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index ad1845a2f..2bb963b46 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,14 +1,14 @@ -++--- androidx.databinding:viewbinding:7.3.1 +++--- androidx.databinding:viewbinding:7.4.0-beta05 +| \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.3.1 -++--- androidx.databinding:databinding-runtime:7.3.1 +++--- androidx.databinding:databinding-common:7.4.0-beta05 +++--- androidx.databinding:databinding-runtime:7.4.0-beta05 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| +--- androidx.databinding:databinding-common:7.3.1 -+| +--- androidx.databinding:viewbinding:7.3.1 (*) ++| +--- androidx.databinding:databinding-common:7.4.0-beta05 ++| +--- androidx.databinding:viewbinding:7.4.0-beta05 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.1 (c) -++--- androidx.databinding:databinding-adapters:7.3.1 -+| +--- androidx.databinding:databinding-runtime:7.3.1 (*) -+| \--- androidx.databinding:databinding-common:7.3.1 -++--- androidx.databinding:databinding-ktx:7.3.1 +++--- androidx.databinding:databinding-adapters:7.4.0-beta05 ++| +--- androidx.databinding:databinding-runtime:7.4.0-beta05 (*) ++| \--- androidx.databinding:databinding-common:7.4.0-beta05 +++--- androidx.databinding:databinding-ktx:7.4.0-beta05 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 @@ -62,8 +62,8 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.20 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.3.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.20 (*) ++| +--- androidx.databinding:databinding-runtime:7.4.0-beta05 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.7.20 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.11 +| +--- com.google.android.datatransport:transport-api:3.0.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) @@ -349,10 +349,10 @@ +| | \--- org.slf4j:slf4j-api:2.0.3 +| \--- androidx.core:core-ktx:1.9.0 (*) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.3.1 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.3.1 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.3.1 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.3.1 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-beta05 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-beta05 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-beta05 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-rc01 (*) +| +--- androidx.cardview:cardview:1.0.0 @@ -765,7 +765,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.3.1 +| +--- androidx.compose.ui:ui:1.3.1 (*) +| +--- androidx.compose.ui:ui-util:1.3.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.3.1 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-beta05 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.4 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) ++--- io.coil-kt:coil-compose:2.2.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4..249e5832f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92f06b50f..2ec77e51a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..a69d9cb6c 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ 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 index ac1b06f93..53a6b238d 100644 --- 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,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,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 +75,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