Merge branch 'release/v1.3.5' into main

stantanasi · Oct 5, 2023 · d942cb4 · d942cb4
2 parents edadd44 + d0ce3fb
commit d942cb4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,14 +7,22 @@ plugins {
 
 android {
     namespace 'com.tanasi.streamflix'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.tanasi.streamflix"
         minSdk 23
-        targetSdk 33
-        versionCode 9
-        versionName "1.3.4"
+        targetSdk 34
+        versionCode 10
+        versionName "1.3.5"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
     }
 
     buildTypes {
@@ -32,29 +40,29 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.4'
     implementation project(path: ':navigation')
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.leanback:leanback:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.13.1'
 
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.0'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.19.0'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.0'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.19.0'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.0'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.1'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.9'
     implementation project(path: ':retrofit-jsoup-converter')
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'org.jsoup:jsoup:1.15.3'
 
-    implementation 'androidx.fragment:fragment-ktx:1.5.6'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.fragment:fragment-ktx:1.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
 
     implementation 'androidx.tvprovider:tvprovider:1.1.0-alpha01'
 }
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.6.0'
+
     repositories {
         google()
     }
     dependencies {
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4'
     }
 }
 
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }