diff --git a/app/build.gradle b/app/build.gradle index 6788d60..8247b2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,13 +33,13 @@ android { keyPassword keystoreProperties['keyPassword'] } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "cz.zegkljan.videoreferee" versionCode 6 versionName "0.5.0-rc.2" minSdkVersion 24 - targetSdkVersion 31 + targetSdkVersion 33 testInstrumentationRunner "android.test.InstrumentationTestRunner" setProperty("archivesBaseName", "VideoReferee") @@ -80,25 +80,25 @@ android { dependencies { // Kotlin lang - implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.core:core-ktx:1.9.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' // App compat and UI things - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Navigation library - def nav_version = "2.4.1" + def nav_version = "2.5.2" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" // Media - implementation 'androidx.media:media:1.5.0' + implementation 'androidx.media:media:1.6.0' // ExoPlayer - def exoplayer_version = "2.17.1" + def exoplayer_version = "2.18.1" implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version" implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version" @@ -121,7 +121,7 @@ dependencies { testImplementation 'androidx.test:rules:1.4.0' testImplementation 'androidx.test:runner:1.4.0' testImplementation 'androidx.test.espresso:espresso-core:3.4.0' - testImplementation 'org.robolectric:robolectric:4.7.3' + testImplementation 'org.robolectric:robolectric:4.8.1' // Instrumented testing androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/app/src/main/java/cz/zegkljan/videoreferee/ZoomPlayerView.kt b/app/src/main/java/cz/zegkljan/videoreferee/ZoomPlayerView.kt index f19f0aa..86ecb01 100644 --- a/app/src/main/java/cz/zegkljan/videoreferee/ZoomPlayerView.kt +++ b/app/src/main/java/cz/zegkljan/videoreferee/ZoomPlayerView.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.Matrix import android.opengl.GLSurfaceView import android.util.AttributeSet -import android.util.Log import android.view.SurfaceView import android.view.View import com.google.android.exoplayer2.Player @@ -73,7 +72,7 @@ class ZoomPlayerView(context: Context, attrs: AttributeSet?) : PlayerView(contex } } if (player.isCommandAvailable(Player.COMMAND_GET_TEXT)) { - subtitleView?.setCues(player.currentCues) + subtitleView?.setCues(player.currentCues.cues) } } diff --git a/app/src/main/java/cz/zegkljan/videoreferee/fragments/PermissionsFragment.kt b/app/src/main/java/cz/zegkljan/videoreferee/fragments/PermissionsFragment.kt index 435ce01..c6729d9 100644 --- a/app/src/main/java/cz/zegkljan/videoreferee/fragments/PermissionsFragment.kt +++ b/app/src/main/java/cz/zegkljan/videoreferee/fragments/PermissionsFragment.kt @@ -71,6 +71,7 @@ class PermissionsFragment : Fragment() { return super.onCreateView(inflater, container, savedInstanceState) } + @Deprecated("Deprecated in Java") override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, grantResults: IntArray ) { diff --git a/build.gradle b/build.gradle index 6e83880..dcc9384 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { // Top-level variables used for versioning - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.10' ext.java_version = JavaVersion.VERSION_1_8 repositories { @@ -29,7 +29,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files