From 393bd5698f9bfd580f7437afc883030866e4026d Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Mon, 18 Nov 2024 16:25:41 -0800 Subject: [PATCH 1/2] Update Android Core to 1.4.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index af276e5e..be69158b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { allprojects { project.ext { - coreVersion = '1.4.2' + coreVersion = '1.4.4' } tasks.withType(DokkaTaskPartial.class) { From 6211812c36d15d6fe52927b3bccb63a6932a9200 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Wed, 20 Nov 2024 15:13:22 -0800 Subject: [PATCH 2/2] update kotlin and compose --- app/build.gradle | 25 +++++++++++-------------- build.gradle | 7 ++++--- library-exo/build.gradle | 4 ++-- library-ima/build.gradle | 12 +++++++----- library/build.gradle | 12 +++++++----- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1042b74c..34881eee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id "org.jetbrains.kotlin.plugin.compose" } android { @@ -9,7 +10,6 @@ android { defaultConfig { applicationId "com.example.muxdatasdkformedia3" - //noinspection OldTargetApi targetSdk 35 minSdk 21 versionCode 1 @@ -71,9 +71,6 @@ android { kotlinOptions { jvmTarget = '1.8' } - composeOptions { - kotlinCompilerExtensionVersion '1.5.14' - } packaging { resources { excludes += '/META-INF/{AL2.0,LGPL2.1}' @@ -85,14 +82,14 @@ dependencies { implementation project(":library-ima") implementation project(":library-exo") implementation project(":library") - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' - implementation 'androidx.activity:activity-compose:1.8.2' - implementation platform('androidx.compose:compose-bom:2023.08.00') + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7' + implementation 'androidx.activity:activity-compose:1.9.3' + implementation platform('androidx.compose:compose-bom:2024.11.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' - androidTestImplementation platform('androidx.compose:compose-bom:2023.08.00') + androidTestImplementation platform('androidx.compose:compose-bom:2024.11.00') androidTestImplementation 'androidx.compose.ui:ui-test-junit4' //noinspection GradleDependency @@ -171,13 +168,13 @@ dependencies { At_latestImplementation "androidx.media3:media3-exoplayer-hls:1.4.1" At_latestImplementation "androidx.media3:media3-exoplayer-rtsp:1.4.1" - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.10.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:1.15.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' debugImplementation 'androidx.compose.ui:ui-tooling' debugImplementation 'androidx.compose.ui:ui-test-manifest' } diff --git a/build.gradle b/build.gradle index be69158b..fc86db23 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,9 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial plugins { - id 'com.android.application' version '8.6.0' apply false - id 'com.android.library' version '8.6.0' apply false - id 'org.jetbrains.kotlin.android' version '1.9.24' apply false + id 'com.android.application' version '8.7.2' apply false + id 'com.android.library' version '8.7.2' apply false + id 'org.jetbrains.kotlin.android' version '2.0.21' apply false + id "org.jetbrains.kotlin.plugin.compose" version "2.0.21" apply false id 'com.mux.gradle.android.mux-android-distribution' version '1.3.0' apply false id "org.jetbrains.dokka" version "1.6.10" } diff --git a/library-exo/build.gradle b/library-exo/build.gradle index f6ebc2d7..290558f0 100644 --- a/library-exo/build.gradle +++ b/library-exo/build.gradle @@ -144,8 +144,8 @@ dependencies { At_latestCompileOnly "androidx.media3:media3-exoplayer-hls:1.4.0" testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } afterEvaluate { diff --git a/library-ima/build.gradle b/library-ima/build.gradle index bf715744..5fd73edf 100644 --- a/library-ima/build.gradle +++ b/library-ima/build.gradle @@ -132,18 +132,20 @@ dependencies { at_1_4Api "androidx.media3:media3-exoplayer-ima:1.4.0" //noinspection GradleDependency at_1_4Api "androidx.media3:media3-exoplayer:1.4.0" + //noinspection GradleDependency At_latestApi "androidx.media3:media3-exoplayer-ima:1.4.0" + //noinspection GradleDependency At_latestApi "androidx.media3:media3-exoplayer:1.4.0" - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'androidx.test.ext:junit:1.2.1' testImplementation "io.mockk:mockk:1.12.3" - testImplementation 'org.robolectric:robolectric:4.10.3' + testImplementation 'org.robolectric:robolectric:4.11.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } afterEvaluate { diff --git a/library/build.gradle b/library/build.gradle index f45d3a14..35f3d210 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -120,16 +120,18 @@ dependencies { at_1_2Api "androidx.media3:media3-common:1.2.0" //noinspection GradleDependency at_1_3Api "androidx.media3:media3-common:1.3.0" + //noinspection GradleDependency at_1_4Api "androidx.media3:media3-common:1.4.0" + //noinspection GradleDependency At_latestApi "androidx.media3:media3-common:1.4.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" testImplementation 'junit:junit:4.13.2' - testImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'androidx.test.ext:junit:1.2.1' testImplementation "io.mockk:mockk:1.12.3" - testImplementation 'org.robolectric:robolectric:4.10.3' + testImplementation 'org.robolectric:robolectric:4.11.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' }