diff --git a/.circleci/config.yml b/.circleci/config.yml index 85b87e8a..f58630c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/code docker: - - image: cimg/android:2022.01.1 + - image: cimg/android:2022.09.2 environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: diff --git a/build.gradle.kts b/build.gradle.kts index e9691b94..e5596190 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.ben-manes.versions") version "0.42.0" + id("com.github.ben-manes.versions") version "0.44.0" } buildscript { @@ -9,8 +9,8 @@ buildscript { } dependencies { - classpath(kotlin("gradle-plugin", "1.7.10")) - classpath("com.android.tools.build:gradle:7.4.0-beta01") + classpath(kotlin("gradle-plugin", "1.7.21")) + classpath("com.android.tools.build:gradle:7.4.0-rc01") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") classpath("com.google.android.gms:oss-licenses-plugin:0.10.5") classpath("com.google.gms:google-services:4.3.14") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..249e5832 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 ae04661e..070cb702 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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..a69d9cb6 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 ac1b06f9..53a6b238 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 diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index ab298786..c1bb0c71 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -70,26 +70,26 @@ android { dependencies { val lifecycleVersion = "2.5.1" - val roomVersion = "2.5.0-alpha03" + val roomVersion = "2.5.0-beta02" coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.0") kapt("androidx.room:room-compiler:$roomVersion") implementation(kotlin("stdlib-jdk8")) - implementation("androidx.browser:browser:1.4.0") + implementation("androidx.browser:browser:1.5.0-alpha01") implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.fragment:fragment-ktx:1.5.3") + implementation("androidx.fragment:fragment-ktx:1.5.4") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.preference:preference:1.2.0") implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.0") - implementation("com.android.billingclient:billing-ktx:5.0.0") + implementation("com.android.billingclient:billing-ktx:5.1.0") implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") - implementation("com.google.android.material:material:1.7.0-rc01") - implementation("com.google.firebase:firebase-analytics-ktx:21.1.1") - implementation("com.google.firebase:firebase-crashlytics:18.2.13") - implementation("com.google.zxing:core:3.5.0") + implementation("com.google.android.material:material:1.7.0") + implementation("com.google.firebase:firebase-analytics-ktx:21.2.0") + implementation("com.google.firebase:firebase-crashlytics:18.3.2") + implementation("com.google.zxing:core:3.5.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.linkedin.dexmaker:dexmaker:2.28.3") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") @@ -100,7 +100,7 @@ dependencies { add("googleImplementation", "com.google.android.play:core-ktx:1.8.1") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.room:room-testing:$roomVersion") - androidTestImplementation("androidx.test:runner:1.4.0") - androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") - androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3") + androidTestImplementation("androidx.test:runner:1.5.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0") + androidTestImplementation("androidx.test.ext:junit-ktx:1.1.4") }