feat: lib upgrade (#457)

Author: PavloNetrebchuk

app/build.gradle

@@ -28,12 +28,13 @@ if (firebaseEnabled) {
 }
 
 android {
-    compileSdk 34
+    namespace 'org.openedx.app'
+    compileSdkVersion compile_sdk_version
 
     defaultConfig {
         applicationId appId
-        minSdk 24
-        targetSdk 34
+        minSdk min_sdk_version
+        targetSdk target_sdk_version
         versionCode 1
         versionName "1.0.0"
 
@@ -42,7 +43,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    namespace 'org.openedx.app'
 
     flavorDimensions += "env"
     productFlavors {
@@ -88,11 +88,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility java_version
+        targetCompatibility java_version
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
+        jvmTarget = java_version
         freeCompilerArgs = List.of("-Xstring-concat=inline")
     }
     buildFeatures {
@@ -129,19 +129,19 @@ dependencies {
 
     ksp "androidx.room:room-compiler:$room_version"
 
-    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
 
     api platform("com.google.firebase:firebase-bom:$firebase_version")
     api "com.google.firebase:firebase-messaging"
 
     // Braze SDK Integration
-    implementation "com.braze:android-sdk-ui:30.2.0"
+    implementation "com.braze:android-sdk-ui:$braze_sdk_version"
 
     // Plugins
-    implementation("com.github.openedx:openedx-app-firebase-analytics-android:1.0.1")
+    implementation("com.github.openedx:openedx-app-firebase-analytics-android:$openedx_firebase_analytics_version")
 
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation "androidx.test.ext:junit:$test_ext_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     testImplementation "junit:junit:$junit_version"
     testImplementation "io.mockk:mockk:$mockk_version"
     testImplementation "io.mockk:mockk-android:$mockk_version"

app/src/main/java/org/openedx/app/AppActivity.kt

@@ -2,7 +2,6 @@ package org.openedx.app
 
 import android.content.Intent
 import android.content.res.Configuration
-import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
@@ -157,10 +156,10 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
         window.apply {
             addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
             WindowCompat.setDecorFitsSystemWindows(this, false)
-
             val insetsController = WindowInsetsControllerCompat(this, binding.root)
             insetsController.isAppearanceLightStatusBars = !isUsingNightModeResources()
-            statusBarColor = Color.TRANSPARENT
+            insetsController.systemBarsBehavior =
+                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
         }
     }
 
@@ -214,21 +213,21 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         this.intent = intent
 
         if (authCode != null) {
             addFragment(SignInFragment.newInstance(null, null, authCode = authCode))
         }
 
-        val extras = intent?.extras
+        val extras = intent.extras
         if (extras?.containsKey(DeepLink.Keys.NOTIFICATION_TYPE.value) == true) {
             handlePushNotification(extras)
         }
 
         if (viewModel.isBranchEnabled) {
-            if (intent?.getBooleanExtra(BRANCH_FORCE_NEW_SESSION, false) == true) {
+            if (intent.getBooleanExtra(BRANCH_FORCE_NEW_SESSION, false)) {
                 Branch.sessionBuilder(this)
                     .withCallback(branchCallback)
                     .reInit()

auth/build.gradle

@@ -6,17 +6,17 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    namespace 'org.openedx.auth'
+    compileSdkVersion compile_sdk_version
 
     defaultConfig {
-        minSdk 24
-        targetSdk 34
+        minSdk min_sdk_version
+        targetSdk target_sdk_version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    namespace 'org.openedx.auth'
 
     flavorDimensions += "env"
     productFlavors {
@@ -33,17 +33,16 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility java_version
+        targetCompatibility java_version
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-        freeCompilerArgs = List.of("-Xstring-concat=inline")
+        jvmTarget = java_version
     }
     buildFeatures {
         viewBinding true
@@ -54,22 +53,28 @@ android {
 dependencies {
     implementation project(path: ':core')
 
-    implementation 'androidx.browser:browser:1.7.0'
-    implementation "androidx.credentials:credentials:1.3.0"
-    implementation "androidx.credentials:credentials-play-services-auth:1.3.0"
-    implementation "com.facebook.android:facebook-login:16.2.0"
-    implementation "com.google.android.gms:play-services-auth:21.2.0"
-    implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"
-    implementation("com.microsoft.identity.client:msal:4.9.0") {
-        //Workaround for the error Failed to resolve: 'io.opentelemetry:opentelemetry-bom' for AS Iguana
-        exclude(group: "io.opentelemetry")
+    // AndroidX
+    implementation "androidx.browser:browser:$browser_version"
+    implementation "androidx.credentials:credentials:$credentials_version"
+    implementation "androidx.credentials:credentials-play-services-auth:$credentials_version"
+
+    // Social Login
+    implementation "com.facebook.android:facebook-login:$facebook_login_version"
+    implementation "com.google.android.gms:play-services-auth:$play_services_auth_version"
+    implementation "com.google.android.libraries.identity.googleid:googleid:$googleid_version"
+    implementation("com.microsoft.identity.client:msal:$msal_version") {
+        exclude group: 'com.microsoft.identity.client', module: 'msal-browser'
+        exclude group: 'io.opentelemetry', module: 'opentelemetry-bom'
     }
-    implementation("io.opentelemetry:opentelemetry-api:1.18.0")
-    implementation("io.opentelemetry:opentelemetry-context:1.18.0")
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+
+    // OpenTelemetry
+    implementation("io.opentelemetry:opentelemetry-api:$opentelemetry_version")
+    implementation("io.opentelemetry:opentelemetry-context:$opentelemetry_version")
+
     testImplementation "junit:junit:$junit_version"
     testImplementation "io.mockk:mockk:$mockk_version"
-    testImplementation "io.mockk:mockk-android:$mockk_version"
     testImplementation "androidx.arch.core:core-testing:$android_arch_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinx_coroutines_test_version"
+    androidTestImplementation "androidx.test.ext:junit:$test_ext_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 }

build.gradle

@@ -6,20 +6,70 @@ import java.util.regex.Pattern
 
 buildscript {
     ext {
+        // Plugin versions
+        android_gradle_plugin_version = '8.12.0'
+        google_services_version = '4.4.3'
+        firebase_crashlytics_version = '3.0.6'
+        ksp_version = '2.0.0-1.0.24'
+
         //Depends on versions in OEXFoundation
         kotlin_version = '2.0.0'
         room_version = '2.6.1'
         detekt_version = '1.23.7'
+
+        // Library versions
+        media3_version = "1.8.0"
+        youtubeplayer_version = "11.1.0"
+        firebase_version = "33.0.0"
+        jsoup_version = '1.21.1'
+        in_app_review = '2.0.2'
+        extented_spans_version = "1.4.0"
+        zip_version = '2.11.5'
+
+        // Third-party library versions
+        branch_sdk_version = '5.20.0'
+        play_services_ads_identifier_version = '18.2.0'
+        install_referrer_version = '2.2'
+        snakeyaml_version = '2.4'
+        openedx_foundation_version = '1.0.1'
+        openedx_firebase_analytics_version = '1.0.1'
+        braze_sdk_version = '37.0.0'
+
+        // AndroidX library versions
+        core_splashscreen_version = '1.0.1'
+        activity_compose_version = '1.10.1'
+        browser_version = '1.9.0'
+        credentials_version = '1.5.0'
+
+        // Social login versions
+        facebook_login_version = '18.1.3'
+        play_services_auth_version = '21.4.0'
+        googleid_version = '1.1.1'
+        msal_version = '7.0.0'
+
+        // OpenTelemetry versions
+        opentelemetry_version = '1.53.0'
+
+        // Testing versions
+        compose_ui_tooling = '1.7.8'
+        mockk_version = '1.14.5'
+        android_arch_version = '2.2.0'
+        junit_version = '4.13.2'
+        test_ext_version = '1.3.0'
+        espresso_version = '3.7.0'
+        kotlinx_coroutines_test_version = '1.10.2'
     }
 }
 
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
+    //noinspection GradlePluginVersion
+    id 'com.android.application' version "$android_gradle_plugin_version" apply false
+    //noinspection GradlePluginVersion
+    id 'com.android.library' version "$android_gradle_plugin_version" apply false
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
-    id 'com.google.gms.google-services' version '4.4.2' apply false
-    id "com.google.firebase.crashlytics" version "3.0.2" apply false
-    id "com.google.devtools.ksp" version "2.0.0-1.0.24" apply false
+    id 'com.google.gms.google-services' version "$google_services_version" apply false
+    id "com.google.firebase.crashlytics" version "$firebase_crashlytics_version" apply false
+    id "com.google.devtools.ksp" version "$ksp_version" apply false
     id "org.jetbrains.kotlin.plugin.compose" version "$kotlin_version" apply false
     id 'io.gitlab.arturbosch.detekt' version "$detekt_version" apply false
 }
@@ -29,25 +79,13 @@ tasks.register('clean', Delete) {
 }
 
 ext {
-    media3_version = "1.4.1"
-    youtubeplayer_version = "11.1.0"
-
-    firebase_version = "33.0.0"
-
-    jsoup_version = '1.13.1'
-
-    in_app_review = '2.0.1'
-
-    extented_spans_version = "1.3.0"
+    // Android SDK versions
+    compile_sdk_version = 36
+    target_sdk_version = 36
+    min_sdk_version = 24
+    java_version = JavaVersion.VERSION_17
 
     configHelper = new ConfigHelper(projectDir, getCurrentFlavor())
-
-    zip_version = '2.6.3'
-    //testing
-    compose_ui_tooling = '1.7.8'
-    mockk_version = '1.13.12'
-    android_arch_version = '2.2.0'
-    junit_version = '4.13.2'
 }
 
 def getCurrentFlavor() {

buildSrc/build.gradle

@@ -14,5 +14,5 @@ java {
 dependencies {
     implementation localGroovy()
     implementation gradleApi()
-    implementation 'org.yaml:snakeyaml:1.33'
+    implementation "org.yaml:snakeyaml:2.4"
 }

core/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.yaml:snakeyaml:2.0'
+        classpath "org.yaml:snakeyaml:$snakeyaml_version"
     }
 }
 
@@ -21,17 +21,17 @@ def config = configHelper.fetchConfig()
 def themeDirectory = config.getOrDefault("THEME_DIRECTORY", "openedx")
 
 android {
-    compileSdk 34
+    namespace 'org.openedx.core'
+    compileSdkVersion compile_sdk_version
 
     defaultConfig {
-        minSdk 24
-        targetSdk 34
+        minSdk min_sdk_version
+        targetSdk target_sdk_version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    namespace 'org.openedx.core'
 
     flavorDimensions += "env"
     productFlavors {
@@ -76,11 +76,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility java_version
+        targetCompatibility java_version
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
+        jvmTarget = java_version
         freeCompilerArgs = List.of("-Xstring-concat=inline")
     }
 
@@ -109,22 +109,22 @@ dependencies {
     api "com.google.android.play:review-ktx:$in_app_review"
 
     // Branch SDK Integration
-    api "io.branch.sdk.android:library:5.9.0"
-    api "com.google.android.gms:play-services-ads-identifier:18.1.0"
-    api "com.android.installreferrer:installreferrer:2.2"
+    api "io.branch.sdk.android:library:$branch_sdk_version"
+    api "com.google.android.gms:play-services-ads-identifier:$play_services_ads_identifier_version"
+    api "com.android.installreferrer:installreferrer:$install_referrer_version"
 
     // Zip
     api "net.lingala.zip4j:zip4j:$zip_version"
 
     //  OpenEdx libs
-    api("com.github.openedx:openedx-app-foundation-android:1.0.1")
+    api("com.github.openedx:openedx-app-foundation-android:$openedx_foundation_version")
 
     // Preview
     debugApi "androidx.compose.ui:ui-tooling:$compose_ui_tooling"
 
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$test_ext_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 }
 
 def insertBuildConfigFields(currentFlavour, buildType) {

core/src/main/java/org/openedx/core/AppDataConstants.kt

@@ -6,7 +6,7 @@ object AppDataConstants {
     const val USER_MIN_YEAR = 13
     const val USER_MAX_YEAR = 77
     const val DEFAULT_MIME_TYPE = "image/jpeg"
-    val defaultLocale = Locale("en")
+    val defaultLocale: Locale = Locale.Builder().setLanguage("en").build()
 
     const val VIDEO_FORMAT_M3U8 = ".m3u8"
     const val VIDEO_FORMAT_MP4 = ".mp4"