Skip to content
Merged
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ buildscript {
}

plugins {
id 'com.android.application' version '8.12.0' apply false
id 'com.android.library' version '8.12.0' apply false
id 'com.android.application' version '8.12.1' apply false
id 'com.android.library' version '8.12.1' apply false
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version" apply false
}
Expand Down
36 changes: 16 additions & 20 deletions projectBlueWater/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id "de.mannodermaus.android-junit5" version "1.13.1.0"
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0'
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.10'
}

apply plugin: 'com.android.application'
Expand Down Expand Up @@ -167,17 +167,17 @@ def getGeneratedVersionCode() {
}

dependencies {
def compose_version = '1.8.3'
def media3_version = '1.7.1'
def lifecycle_version = '2.9.1'
def junit5_version = '5.13.3'
def compose_version = '1.9.0'
def media3_version = '1.8.0'
def lifecycle_version = '2.9.2'
def junit5_version = '5.13.4'

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'

implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation 'androidx.annotation:annotation:1.9.1'
implementation 'androidx.work:work-runtime:2.10.2'
implementation 'androidx.media:media:1.7.0'
implementation 'androidx.work:work-runtime:2.10.3'
implementation 'androidx.media:media:1.7.1'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
Expand All @@ -188,7 +188,7 @@ dependencies {
implementation 'com.google.android.material:material:1.12.0'
implementation 'com.google.guava:guava:33.4.8-android'
implementation 'joda-time:joda-time:2.14.0'
implementation 'commons-io:commons-io:2.19.0'
implementation 'commons-io:commons-io:2.20.0'
implementation 'org.slf4j:slf4j-api:2.0.17'
implementation 'com.github.tony19:logback-android:3.0.0'
implementation 'com.namehillsoftware:handoff:0.30.1'
Expand All @@ -197,7 +197,7 @@ dependencies {
implementation 'org.jsoup:jsoup:1.21.1'
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-datasource-okhttp:$media3_version"
implementation 'com.squareup.okio:okio:3.15.0'
implementation 'com.squareup.okio:okio:3.16.0'
implementation 'com.squareup.okhttp3:okhttp:5.1.0'
implementation 'com.namehillsoftware:querydroid:0.6.0'
implementation "androidx.compose.ui:ui:$compose_version"
Expand All @@ -211,20 +211,16 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
testCompileOnly 'junit:junit:4.13.2'
testImplementation 'commons-codec:commons-codec:1.18.0'
testImplementation 'commons-codec:commons-codec:1.19.0'
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation 'org.assertj:assertj-core:3.27.4'
testImplementation 'org.robolectric:robolectric:4.15.1'
testImplementation 'androidx.test.ext:junit-ktx:1.2.1'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'androidx.test:runner:1.6.2'
testImplementation 'io.mockk:mockk:1.14.4'
testImplementation 'androidx.test.ext:junit-ktx:1.3.0'
testImplementation 'androidx.test:core:1.7.0'
testImplementation 'androidx.test:runner:1.7.0'
testImplementation 'io.mockk:mockk:1.14.5'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
testImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
androidTestImplementation "org.assertj:assertj-core:3.27.3"
androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
androidTestImplementation 'androidx.test:core:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ class HandlerDispatchingExoPlayer(private val innerPlayer: ExoPlayer, private va
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
override fun setShuffleOrder(shuffleOrder: ShuffleOrder): Promise<PromisingExoPlayer> =
loopIn {
innerPlayer.setShuffleOrder(shuffleOrder)
innerPlayer.shuffleOrder = shuffleOrder
this
}

Expand Down