Skip to content

Commit 2f49af0

Browse files
committed
CSDK-2521: Updating Gradle/Kotlin version
1 parent b283c7e commit 2f49af0

File tree

9 files changed

+17
-68
lines changed

9 files changed

+17
-68
lines changed

DailyDemo/.gitignore

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
4+
/.idea
105
.DS_Store
116
/build
127
/captures

DailyDemo/.idea/.gitignore

-3
This file was deleted.

DailyDemo/.idea/compiler.xml

-6
This file was deleted.

DailyDemo/.idea/gradle.xml

-20
This file was deleted.

DailyDemo/.idea/misc.xml

-21
This file was deleted.

DailyDemo/app/build.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
2+
id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.20'
33
}
44

55
apply plugin: 'com.android.application'
66
apply plugin: 'kotlin-android'
77

88
android {
9+
namespace "co.daily.core.dailydemo"
10+
911
defaultConfig {
1012
applicationId "co.daily.core.dailydemo"
1113
compileSdk 34
@@ -15,8 +17,8 @@ android {
1517
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1618
}
1719
compileOptions {
18-
sourceCompatibility JavaVersion.VERSION_1_8
19-
targetCompatibility JavaVersion.VERSION_1_8
20+
sourceCompatibility JavaVersion.VERSION_17
21+
targetCompatibility JavaVersion.VERSION_17
2022
}
2123

2224
buildTypes {
@@ -31,16 +33,16 @@ android {
3133
}
3234

3335
dependencies {
34-
implementation 'androidx.appcompat:appcompat:1.4.1'
36+
implementation 'androidx.appcompat:appcompat:1.7.0'
3537

3638
implementation 'co.daily:client:0.24.0'
3739

3840
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3941
implementation 'com.google.android.flexbox:flexbox:3.0.0'
40-
implementation 'com.google.android.material:material:1.6.1'
41-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
42-
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.0'
43-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-alpha05")
42+
implementation 'com.google.android.material:material:1.12.0'
43+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
44+
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
45+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
4446
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
4547
}
4648

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class MainActivity : AppCompatActivity(), DemoStateListener {
238238
view.videoScaleMode = VideoView.VideoScaleMode.FILL
239239
if (!userToggledLocalPreview) localVideoToggle.isChecked = true
240240
}
241-
VideoTrackType.ScreenShare -> {
241+
else -> {
242242
view.videoScaleMode = VideoView.VideoScaleMode.FIT
243243
if (!userToggledLocalPreview) localVideoToggle.isChecked = false
244244
}
@@ -734,6 +734,7 @@ class MainActivity : AppCompatActivity(), DemoStateListener {
734734
}
735735

736736
override fun onBackPressed() {
737+
super.onBackPressed()
737738
finish()
738739
}
739740
}

DailyDemo/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.6.21'
3+
ext.kotlin_version = '2.0.20'
44

55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.4.0'
10+
classpath 'com.android.tools.build:gradle:8.3.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Thu Oct 03 12:27:48 BST 2024
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)