Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update deps #104

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id "org.jetbrains.kotlin.plugin.compose"
}

android {
Expand All @@ -9,7 +10,6 @@ android {

defaultConfig {
applicationId "com.example.muxdatasdkformedia3"
//noinspection OldTargetApi
targetSdk 35
minSdk 21
versionCode 1
Expand Down Expand Up @@ -71,9 +71,6 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.14'
}
packaging {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -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
Expand Down Expand Up @@ -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'
}
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
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"
}

allprojects {
project.ext {
coreVersion = '1.4.2'
coreVersion = '1.4.4'
}

tasks.withType(DokkaTaskPartial.class) {
Expand Down
4 changes: 2 additions & 2 deletions library-exo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 7 additions & 5 deletions library-ima/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 7 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}