From 9cfffa99cc480ce5b021fe809e96cc8580240977 Mon Sep 17 00:00:00 2001
From: ThibaultBee <37510686+ThibaultBee@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:08:42 +0100
Subject: [PATCH] chore(*): upgrade dependencies (StreamPack 2.6.0)

---
 .github/workflows/build.yml                        |  9 +++++----
 app/build.gradle                                   | 14 ++++++++------
 app/src/main/AndroidManifest.xml                   | 11 +++++++++++
 .../thibaultbee/streampack/example/MainActivity.kt | 11 ++++++++---
 build.gradle                                       |  6 +++---
 gradle.properties                                  |  3 ++-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 7 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2b7340..1d08bcb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,11 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 12
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 12
+          distribution: 'adopt'
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build
diff --git a/app/build.gradle b/app/build.gradle
index 8145050..299743d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'io.github.thibaultbee.streampack.example'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "io.github.thibaultbee.streampack.example"
         minSdk 26
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -31,7 +31,9 @@ android {
         jvmTarget = '1.8'
     }
     packagingOptions {
-        pickFirst '**/*.so'
+        jniLibs {
+            pickFirsts += ['**/*.so']
+        }
     }
     buildFeatures {
         viewBinding true
@@ -40,9 +42,9 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation "io.github.thibaultbee:streampack:${streampackVersion}"
@@ -50,7 +52,7 @@ dependencies {
     implementation "io.github.thibaultbee:streampack-extension-rtmp:${streampackVersion}"
     // Only needed for SRT live streaming
     implementation "io.github.thibaultbee:streampack-extension-srt:${streampackVersion}"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d75c64..8495611 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- For play store -->
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+
+    <!-- Required permissions -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Use internally. Not use with camera but it avoid a warning -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/io/github/thibaultbee/streampack/example/MainActivity.kt b/app/src/main/java/io/github/thibaultbee/streampack/example/MainActivity.kt
index 1cdc2bb..d6dfa29 100644
--- a/app/src/main/java/io/github/thibaultbee/streampack/example/MainActivity.kt
+++ b/app/src/main/java/io/github/thibaultbee/streampack/example/MainActivity.kt
@@ -24,7 +24,6 @@ import io.github.thibaultbee.streampack.listeners.OnConnectionListener
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 import io.github.thibaultbee.streampack.streamers.StreamerLifeCycleObserver
 import io.github.thibaultbee.streampack.streamers.helpers.CameraStreamerConfigurationHelper
-import io.github.thibaultbee.streampack.utils.TAG
 import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
@@ -125,8 +124,10 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
             } else {
-                streamer.stopStream()
-                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                lifecycleScope.launch {
+                    streamer.stopStream()
+                    requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                }
             }
         }
     }
@@ -185,4 +186,8 @@ class MainActivity : AppCompatActivity() {
     private fun toast(message: String) {
         runOnUiThread { applicationContext.toast(message) }
     }
+
+    companion object {
+        private const val TAG = "MainActivity"
+    }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c22277e..409b19c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@
 buildscript {
     ext {
         // Upgrade StreamPack version here
-        streampackVersion = '2.5.2'
+        streampackVersion = '2.6.0'
     }
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..f19c7b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c7c1f09..dfed7ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Mar 26 13:16:11 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME