Update Gradle and dependencies (#26)

THEOplayer · Feb 19, 2024 · 5939a83 · 5939a83
1 parent 17a631b
commit 5939a83
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -47,7 +47,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,4 +15,4 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.dokka) apply false
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -21,7 +21,7 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
+android.nonFinalResIds=true
+org.gradle.configuration-cache=true
 # The version of the THEOplayer Open Video UI for Android.
 libraryVersion=1.4.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,15 +2,16 @@
 gradle = "8.2.2"
 kotlin-gradle-plugin = "1.8.10"
 ktx = "1.12.0"
-lifecycle-runtime = "2.6.2"
-activity-compose = "1.8.1"
+lifecycle-runtime = "2.7.0"
+activity-compose = "1.8.2"
 appcompat = "1.6.1"
 compose-bom = "2024.02.00"
 junit4 = "4.13.2"
+ui-test-junit4 = "1.6.1" # ...not in BOM for some reason?
 androidx-junit = "1.1.5"
 androidx-espresso = "3.5.1"
 dokka = "1.8.10"
-theoplayer = "6.4.0"
+theoplayer = "6.10.0"
 
 [libraries]
 androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
@@ -21,8 +22,8 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
 androidx-compose-ui-ui = { group = "androidx.compose.ui", name = "ui" }
-androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
-androidx-compose-ui-testJunit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test" }
+androidx-compose-ui-testJunit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "ui-test-junit4" }
 androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-toolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }

diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -51,7 +51,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }

diff --git a/ui/src/main/java/com/theoplayer/android/ui/Menu.kt b/ui/src/main/java/com/theoplayer/android/ui/Menu.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowBack
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
@@ -37,7 +37,7 @@ fun MenuScope.Menu(
     title: @Composable () -> Unit,
     backIcon: @Composable () -> Unit = {
         Icon(
-            Icons.Rounded.ArrowBack,
+            Icons.AutoMirrored.Rounded.ArrowBack,
             contentDescription = "Back"
         )
     },

diff --git a/ui/src/main/java/com/theoplayer/android/ui/MuteButton.kt b/ui/src/main/java/com/theoplayer/android/ui/MuteButton.kt
@@ -2,8 +2,8 @@ package com.theoplayer.android.ui
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.VolumeOff
-import androidx.compose.material.icons.rounded.VolumeUp
+import androidx.compose.material.icons.automirrored.rounded.VolumeOff
+import androidx.compose.material.icons.automirrored.rounded.VolumeUp
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -24,13 +24,13 @@ fun MuteButton(
     contentPadding: PaddingValues = PaddingValues(0.dp),
     mute: @Composable () -> Unit = {
         Icon(
-            Icons.Rounded.VolumeUp,
+            Icons.AutoMirrored.Rounded.VolumeUp,
             contentDescription = "Mute"
         )
     },
     unmute: @Composable () -> Unit = {
         Icon(
-            Icons.Rounded.VolumeOff,
+            Icons.AutoMirrored.Rounded.VolumeOff,
             contentDescription = "Unmute"
         )
     }