diff --git a/app/src/main/java/com/weatherxm/data/Modules.kt b/app/src/main/java/com/weatherxm/data/Modules.kt index 5ea4422cb..8d7c0bce0 100644 --- a/app/src/main/java/com/weatherxm/data/Modules.kt +++ b/app/src/main/java/com/weatherxm/data/Modules.kt @@ -332,6 +332,8 @@ private const val WRITE_TIMEOUT = 60L private const val FIREBASE_CONFIG_FETCH_INTERVAL_DEBUG = 30L private const val FIREBASE_CONFIG_FETCH_INTERVAL_RELEASE = 1800L +private const val MIXPANEL_EU_SERVER_URL = "https://api-eu.mixpanel.com" + private const val COIL_MEMORY_CACHE_SIZE_PERCENTAGE = 0.25 private const val COIL_DISK_CACHE_SIZE_PERCENTAGE = 0.02 @@ -629,6 +631,7 @@ val analytics = module { single(createdAtStart = true) { MixpanelAPI.getInstance(androidContext(), BuildConfig.MIXPANEL_TOKEN, false).apply { + setServerURL(MIXPANEL_EU_SERVER_URL) setEnableLogging(true) } } diff --git a/build.gradle.kts b/build.gradle.kts index f17ff3725..d24fb4d44 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,6 +70,6 @@ task("clean") { * Configures gradle wrapper for this project */ tasks.wrapper { - gradleVersion = "8.5" + gradleVersion = "8.14.4" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8251a8290..b023d7435 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] -androidx-activity = "1.12.0" -androidx-annotation = "1.9.1" +androidx-activity = "1.13.0" +androidx-annotation = "1.10.0" androidx-appcompat = "1.7.1" androidx-arch-core-testing = "2.2.0" -androidx-browser = "1.9.0" -androidx-collection-ktx = "1.5.0" +androidx-browser = "1.10.0" +androidx-collection-ktx = "1.6.0" androidx-compose-foundation = "1.9.5" androidx-compose-material3 = "1.4.0" androidx-compose-preview = "1.9.5" androidx-constraintlayout = "2.2.1" androidx-coordinatorlayout = "1.3.0" -androidx-core-ktx = "1.17.0" +androidx-core-ktx = "1.18.0" androidx-core-splashscreen = "1.2.0" androidx-fragment-ktx = "1.8.9" androidx-lifecycle-ktx = "2.10.0" @@ -19,59 +19,59 @@ androidx-preference-ktx = "1.2.1" androidx-room = "2.8.4" androidx-security-crypto = "1.1.0" androidx-startup-runtime = "1.2.0" -androidx-swiperefreshlayout = "1.1.0" +androidx-swiperefreshlayout = "1.2.0" androidx-test-rules = "1.7.0" androidx-test-runner = "1.7.0" androidx-viewpager2 = "1.1.0" -androidx-work-runtime-ktx = "2.11.0" -arrow = "2.2.0" +androidx-work-runtime-ktx = "2.11.2" +arrow = "2.2.3" barcode-scanner = "4.3.0" better-link-movement-method = "2.2.0" -billing = "8.3.0" -chucker = "4.2.0" +billing = "9.1.0" +chucker = "4.3.1" coil = "3.3.0" desugar_jdk_libs = "2.1.5" -dfu = "2.10.1" -firebase-bom = "34.6.0" +dfu = "2.11.0" +firebase-bom = "34.15.0" gauge = "0.0.1" input-mask-android = "7.2.6" insetter = "0.6.1" -json = "20250517" +json = "20260522" jwtdecode = "2.0.2" kable = "0.40.0" -koin-android = "4.1.1" -kotest = "5.9.1" +koin-android = "4.2.2" +kotest = "6.2.1" kotest-koin = "1.3.0" kpermissions = "3.5.0" lottie = "6.7.1" -material = "1.13.0" +material = "1.14.0" mapbox = "11.16.2" mapbox-sdk-services = "7.8.0" mapbox-search-android = "2.15.0" markdown-renderer = "0.38.1" -mixpanel = "8.2.4" -mockk = "1.14.6" +mixpanel = "8.8.0" +mockk = "1.14.11" moshi = "1.15.2" mpAndroidCharts = "v3.1.0" networkResponseAdapter = "5.0.0" -play-services-location = "21.3.0" +play-services-location = "21.4.0" play-services-barcode-scanner = "16.1.0" -okhttp-bom = "5.3.2" +okhttp-bom = "5.4.0" retrofit = "3.0.0" retromock = "1.2.1" timber = "5.0.1" upload-service = "4.9.4" # Plugins -android-gradle-plugin = "8.13.1" +android-gradle-plugin = "8.13.2" detekt-plugin = "1.23.8" -firebase-appdistribution-plugin = "5.2.0" -firebase-crashlytics-plugin = "3.0.6" +firebase-appdistribution-plugin = "5.3.0" +firebase-crashlytics-plugin = "3.0.7" firebase-perf-plugin = "2.0.2" -google-services-plugin = "4.4.4" -grgit = "5.3.2" -kotlin = "2.2.21" -ksp-plugin = "2.3.3" +google-services-plugin = "4.5.0" +grgit = "5.3.3" +kotlin = "2.4.0" +ksp-plugin = "2.3.9" [libraries] androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" } @@ -175,4 +175,3 @@ grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-plugin" } - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..9bbc975c7 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 fc062e41f..aaaabb3cb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Mon Jun 30 11:13:12 EEST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421..faf93008b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +85,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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +133,13 @@ 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. @@ -144,7 +147,7 @@ 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 @@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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 +200,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, 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" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..9d21a2183 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,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 +59,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