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
12 changes: 6 additions & 6 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ dependencies {
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation project(':capacitor-android')
implementation "androidx.core:core-ktx:$androidxCoreVersion"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.1'
// monitoring: background checks (monitor/MonitorWorker.kt) in a hidden WebView served from the APK assets
implementation 'androidx.work:work-runtime-ktx:2.10.3'
implementation 'androidx.work:work-runtime-ktx:2.12.0'
implementation "androidx.webkit:webkit:$androidxWebkitVersion"
// native player on Android TV (player/PlayerActivity.kt)
// Media3 is aligned with 2160 Player's player-core (it exposes media3-exoplayer as api), see the version
Expand All @@ -139,16 +139,16 @@ dependencies {
// second player engine on Android TV (LGPL-2.1), used from v0.15 Task 4
implementation 'org.videolan.android:libvlc-all:3.7.7'
// install assistant: LG Developer Mode over SSH (BSD-3-Clause) and Android TV over adb (Apache-2.0), see install/
implementation 'com.github.mwiede:jsch:2.28.7'
implementation 'com.github.mwiede:jsch:2.28.8'
implementation 'dev.mobile:dadb:2.0.0'
testImplementation "junit:junit:$junitVersion"
// real org.json for the control router tests (android.jar only has stubs)
testImplementation "org.json:json:20240303"
// local HTTP server for the release download redirect tests (install/OkReleaseHttpTest)
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
testImplementation 'org.robolectric:robolectric:4.16.1'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.1'
testImplementation 'org.robolectric:robolectric:4.17'
// UpdateRelaunch: schedule/inspect the deferred launch check (UpdateRelaunchTest)
testImplementation 'androidx.work:work-testing:2.10.3'
testImplementation 'androidx.work:work-testing:2.12.0'
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:9.4.1'
classpath 'com.google.gms:google-services:4.4.4'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.20'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.21'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -31,7 +31,7 @@ allprojects {
subprojects {
configurations.configureEach {
resolutionStrategy {
force 'commons-io:commons-io:2.18.0', 'org.apache.commons:commons-lang3:3.18.0'
force 'commons-io:commons-io:2.22.0', 'org.apache.commons:commons-lang3:3.21.0'
}
}
}
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
194 changes: 112 additions & 82 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading