Merge branch 'dev' into comp

gradle.properties

@@ -1,26 +1,40 @@
-android.useAndroidX=true
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Jun 26 09:56:43 AEST 2023
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx8g
 
 gradlePluginVersion=7.3.1
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.unsafe.configuration-cache=true
+
 googleServicesVersion=4.3.12
 kotlinVersion=1.8.21
+android.useAndroidX=true
+appcompatVersion=1.6.1
+coreVersion=1.8.0
 coroutinesVersion=1.6.4
-kotlinxJsonVersion=1.3.3
-lifecycleVersion=2.5.1
+curve25519Version=0.6.0
 daggerVersion=2.46.1
 glideVersion=4.11.0
-kovenantVersion=3.3.0
-curve25519Version=0.6.0
-protobufVersion=2.5.0
-okhttpVersion=3.12.1
 jacksonDatabindVersion=2.9.8
-appcompatVersion=1.5.1
-materialVersion=1.7.0
-preferenceVersion=1.2.0
-coreVersion=1.8.0
-
 junitVersion=4.13.2
-mockitoKotlinVersion=4.0.0
-testCoreVersion=1.4.0
-pagingVersion=3.0.0
+kotlinxJsonVersion=1.3.3
+kovenantVersion=3.3.0
+lifecycleVersion=2.5.1
+materialVersion=1.8.0
+mockitoKotlinVersion=4.1.0
+okhttpVersion=3.12.1
+pagingVersion=3.0.0
+preferenceVersion=1.2.0
+protobufVersion=2.5.0
+testCoreVersion=1.5.0