CSDK-2521: Updating Gradle/Kotlin version

DailyDemo/.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

DailyDemo/app/build.gradle

@@ -1,11 +1,13 @@
 plugins {
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.20'
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "co.daily.core.dailydemo"
+
     defaultConfig {
         applicationId "co.daily.core.dailydemo"
         compileSdk 34
@@ -15,8 +17,8 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     buildTypes {
@@ -31,16 +33,16 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 
     implementation 'co.daily:client:0.24.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.0'
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-alpha05")
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
 }
 

DailyDemo/app/src/main/java/co/daily/core/dailydemo/MainActivity.kt

@@ -238,7 +238,7 @@ class MainActivity : AppCompatActivity(), DemoStateListener {
                     view.videoScaleMode = VideoView.VideoScaleMode.FILL
                     if (!userToggledLocalPreview) localVideoToggle.isChecked = true
                 }
-                VideoTrackType.ScreenShare -> {
+                else -> {
                     view.videoScaleMode = VideoView.VideoScaleMode.FIT
                     if (!userToggledLocalPreview) localVideoToggle.isChecked = false
                 }
@@ -734,6 +734,7 @@ class MainActivity : AppCompatActivity(), DemoStateListener {
     }
 
     override fun onBackPressed() {
+        super.onBackPressed()
         finish()
     }
 }

DailyDemo/build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '2.0.20'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

DailyDemo/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Oct 03 12:27:48 BST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists