Merge branch 'develop' into feat/video_navigation

# Conflicts:
#	course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
#	course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt

Author: PavloNetrebchuk

app/build.gradle

@@ -91,9 +91,11 @@ android {
         sourceCompatibility java_version
         targetCompatibility java_version
     }
-    kotlinOptions {
-        jvmTarget = java_version
-        freeCompilerArgs = List.of("-Xstring-concat=inline")
+    kotlin {
+        compilerOptions {
+            jvmTarget = jvm_target_version
+            freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
+        }
     }
     buildFeatures {
         viewBinding true

app/proguard-rules.pro

@@ -69,3 +69,7 @@
 -dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
 -dontwarn com.android.billingclient.api.BillingClientStateListener
 -dontwarn com.android.billingclient.api.PurchasesUpdatedListener
+-dontwarn com.google.crypto.tink.subtle.XChaCha20Poly1305
+-dontwarn net.jcip.annotations.GuardedBy
+-dontwarn net.jcip.annotations.Immutable
+-dontwarn net.jcip.annotations.ThreadSafe