diff --git a/.circleci/config.yml b/.circleci/config.yml index f58630c4..26f3c264 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/code docker: - - image: cimg/android:2022.09.2 + - image: cimg/android:2023.04.1 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 154df051..f8e64110 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.ben-manes.versions") version "0.44.0" + id("com.github.ben-manes.versions") version "0.46.0" } buildscript { @@ -9,9 +9,9 @@ buildscript { } dependencies { - classpath(kotlin("gradle-plugin", "1.8.0")) + classpath(kotlin("gradle-plugin", "1.8.20")) classpath("com.android.tools.build:gradle:7.4.0-rc01") // fixed to prevent crash on Android 8.1- - classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.4") classpath("com.google.android.gms:oss-licenses-plugin:0.10.6") classpath("com.google.gms:google-services:4.3.15") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..943f0cbf 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 070cb702..bdc9a83b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..65dcd68d 100755 --- 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,10 +80,10 @@ 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##*/} +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"' @@ -143,12 +143,16 @@ fi 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 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 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b238..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 534c5380..bd97e780 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -25,7 +25,7 @@ android { minSdk = 21 targetSdk = 33 resourceConfigurations.addAll(arrayOf("it", "pt-rBR", "ru", "zh-rCN", "zh-rTW")) - versionCode = 305 + versionCode = 306 versionName = "2.15.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions.annotationProcessorOptions.arguments.apply { @@ -65,28 +65,28 @@ android { } dependencies { - val lifecycleVersion = "2.5.1" - val roomVersion = "2.5.0" + val lifecycleVersion = "2.6.1" + val roomVersion = "2.5.1" - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.0") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") kapt("androidx.room:room-compiler:$roomVersion") implementation(kotlin("stdlib-jdk8")) - implementation("androidx.browser:browser:1.5.0-beta01") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.fragment:fragment-ktx:1.5.5") + implementation("androidx.browser:browser:1.5.0") + implementation("androidx.core:core-ktx:1.10.0") + implementation("androidx.fragment:fragment-ktx:1.5.6") 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.1") - implementation("com.android.billingclient:billing-ktx:5.1.0") + implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.2") + implementation("com.android.billingclient:billing-ktx:5.2.0") implementation("com.github.tiann:FreeReflection:3.1.0") - implementation("com.google.android.gms:play-services-base:18.1.0") // fix for GoogleApiActivity crash + implementation("com.google.android.gms:play-services-base:18.2.0") // fix for GoogleApiActivity crash @ 18.1.0+ implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") - implementation("com.google.android.material:material:1.8.0-rc01") - implementation("com.google.firebase:firebase-analytics-ktx:21.2.0") - implementation("com.google.firebase:firebase-crashlytics:18.3.3") + implementation("com.google.android.material:material:1.8.0") + implementation("com.google.firebase:firebase-analytics-ktx:21.2.1") + implementation("com.google.firebase:firebase-crashlytics:18.3.6") implementation("com.google.zxing:core:3.5.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.linkedin.dexmaker:dexmaker:2.28.3")