Merge remote-tracking branch 'origin/fix/dev' into fix/dev

d3xvn · d3xvn · commit db639a0de31e · 2025-01-24T13:29:01.000+01:00
diff --git a/audioroom_tutorial/android/app/build.gradle b/audioroom_tutorial/android/app/build.gradle
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "io.getstream.audioroom_tutorial"
-    compileSdk flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
diff --git a/audioroom_tutorial/android/settings.gradle b/audioroom_tutorial/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"
diff --git a/livestreaming_tutorial/android/app/build.gradle b/livestreaming_tutorial/android/app/build.gradle
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "io.getstream.livestreaming_tutorial"
-    compileSdk flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
diff --git a/livestreaming_tutorial/android/settings.gradle b/livestreaming_tutorial/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"
diff --git a/video_calling_tutorial/android/app/build.gradle b/video_calling_tutorial/android/app/build.gradle
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "io.getstream.video_calling_tutorial"
-    compileSdk flutter.compileSdkVersion
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
diff --git a/video_calling_tutorial/android/settings.gradle b/video_calling_tutorial/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pluginManagement {`
`20`	`20`	`plugins {`
`21`	`21`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`22`	`22`	`id "com.android.application" version "7.3.0" apply false`
`23`		`- id "org.jetbrains.kotlin.android" version "1.7.10" apply false`
	`23`	`+ id "org.jetbrains.kotlin.android" version "2.0.20" apply false`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`include ":app"`