diff --git a/build.gradle b/build.gradle index 6253e42..3c5af43 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.5.31' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" @@ -33,9 +33,9 @@ task clean(type: Delete) { } ext { - version_code = 4_00_09_00 - version_name = "4.0.9-0" - yt_version = "YT38a" + version_code = 4_00_10_00 + version_name = "4.0.10-0" + yt_version = "YT39a" target_sdk_version = 30 min_sdk_version = 22 @@ -46,7 +46,8 @@ ext { libpeercast_version = "4.0.4" - androidx_version = "1.3.1" + androidx_compat_version = "1.3.1" + androidx_core_version = "1.5.0" leanback_version = "1.1.0-rc01" lifecycle_version = "2.4.0-alpha03" diff --git a/common/build.gradle b/common/build.gradle index 2d840fe..ef7e5ab 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -45,8 +45,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" - implementation "androidx.appcompat:appcompat:$androidx_version" - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.appcompat:appcompat:$androidx_compat_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.preference:preference-ktx:1.1.1" implementation "com.jakewharton.timber:timber:$timber_version" diff --git a/core/build.gradle b/core/build.gradle index 2b54717..3d96a79 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -80,8 +80,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" - implementation "androidx.appcompat:appcompat:$androidx_version" - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.appcompat:appcompat:$androidx_compat_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version" diff --git a/core/src/main/jni/peercast-yt-android b/core/src/main/jni/peercast-yt-android index 0763385..56b17ed 160000 --- a/core/src/main/jni/peercast-yt-android +++ b/core/src/main/jni/peercast-yt-android @@ -1 +1 @@ -Subproject commit 0763385888870f0a576e8a9e4c50b0f3a80afd4e +Subproject commit 56b17edee44ab80637371b423d5f5373cebd011b diff --git a/tv/build.gradle b/tv/build.gradle index 52dda57..9f04d40 100644 --- a/tv/build.gradle +++ b/tv/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.leanback:leanback:$leanback_version" implementation "androidx.leanback:leanback-preference:$leanback_version" diff --git a/ui/build.gradle b/ui/build.gradle index 1872056..be348ee 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -42,8 +42,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" - implementation "androidx.appcompat:appcompat:$androidx_version" - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.appcompat:appcompat:$androidx_compat_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.preference:preference-ktx:1.1.1" implementation "com.google.android.material:material:1.4.0"