Fix some incompatibilities

goncalocostamendes · goncalocostamendes · commit 82c74b8cc20e · 2025-02-11T11:31:44.000+01:00
diff --git a/.test/build.gradle.kts b/.test/build.gradle.kts
@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	kotlin("jvm") version "1.6.10"
+	kotlin("jvm") version "2.1.0"
 }
 
 repositories {
@@ -29,6 +29,6 @@ tasks.test {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-	kotlinOptions.jvmTarget = "1.8"
+	kotlinOptions.jvmTarget = "17"
 }
 
diff --git a/ARCore-Integration-Java/build.gradle b/ARCore-Integration-Java/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Advanced-Audio-Driver-Java/build.gradle b/Advanced-Audio-Driver-Java/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Advanced-Audio-Driver-Kotlin/app/build.gradle b/Advanced-Audio-Driver-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Advanced-Audio-Driver-Kotlin/build.gradle b/Advanced-Audio-Driver-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Archiving-Java/build.gradle b/Archiving-Java/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Archiving-Kotlin/app/build.gradle b/Archiving-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Archiving-Kotlin/build.gradle b/Archiving-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Basic-Audio-Driver-Kotlin/app/build.gradle b/Basic-Audio-Driver-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Basic-Audio-Driver-Kotlin/build.gradle b/Basic-Audio-Driver-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Basic-Video-Chat-Kotlin/app/build.gradle b/Basic-Video-Chat-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Basic-Video-Chat-Kotlin/build.gradle b/Basic-Video-Chat-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/E2EE-Video-Chat-Kotlin/app/build.gradle b/E2EE-Video-Chat-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/E2EE-Video-Chat-Kotlin/build.gradle b/E2EE-Video-Chat-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Live-Photo-Capture-Kotlin/app/build.gradle b/Live-Photo-Capture-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Live-Photo-Capture-Kotlin/build.gradle b/Live-Photo-Capture-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Media-Transformers-Kotlin/app/build.gradle b/Media-Transformers-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Multiparty-Constraint-Layout-Kotlin/app/build.gradle b/Multiparty-Constraint-Layout-Kotlin/app/build.gradle
@@ -33,7 +33,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Multiparty-Constraint-Layout-Kotlin/build.gradle b/Multiparty-Constraint-Layout-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Phone-Call-Detection-Kotlin/app/build.gradle b/Phone-Call-Detection-Kotlin/app/build.gradle
@@ -9,7 +9,7 @@ apply {
 
 android {
     namespace "com.tokbox.sample.phonecalldetection"
-    compileSdkVersion extCompileSdkVersion
+    compileSdkVersion 35
 
     defaultConfig {
         applicationId "com.tokbox.sample.phonecalldetection"
@@ -32,16 +32,15 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
 dependencies {
     // Dependency versions are defined in the ../../commons.gradle file
-    implementation "com.opentok.android:opentok-android-sdk:2.25.1"
+    implementation "com.vonage:client-sdk-video:${extOpentokSdkVersion}"
     implementation "androidx.appcompat:appcompat:${extAppCompatVersion}"
     implementation "pub.devrel:easypermissions:${extEasyPermissionsVersion}"
     implementation "androidx.constraintlayout:constraintlayout:${extConstraintLyoutVersion}"
     implementation "androidx.core:core-ktx:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"
 }
diff --git a/Phone-Call-Detection-Kotlin/build.gradle b/Phone-Call-Detection-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/Screen-Sharing-Kotlin/app/build.gradle b/Screen-Sharing-Kotlin/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/Screen-Sharing-Kotlin/build.gradle b/Screen-Sharing-Kotlin/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.6.0' apply false
     id 'com.android.library' version '8.6.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 
 task clean(type: Delete) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
`2`	`2`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`3`	`3`
`4`	`4`	`plugins {`
`5`		`- kotlin("jvm") version "1.6.10"`
	`5`	`+ kotlin("jvm") version "2.1.0"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`repositories {`
`@@ -29,6 +29,6 @@ tasks.test {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`tasks.withType<KotlinCompile>().configureEach {`
`32`		`- kotlinOptions.jvmTarget = "1.8"`
	`32`	`+ kotlinOptions.jvmTarget = "17"`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`plugins {`
`3`	`3`	`id 'com.android.application' version '8.6.0' apply false`
`4`	`4`	`id 'com.android.library' version '8.6.0' apply false`
`5`		`- id 'org.jetbrains.kotlin.android' version '1.6.10' apply false`
	`5`	`+ id 'org.jetbrains.kotlin.android' version '2.1.0' apply false`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`task clean(type: Delete) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`kotlinOptions {`
`35`		`- jvmTarget = '1.8'`
	`35`	`+ jvmTarget = '17'`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ android {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`kotlinOptions {`
`36`		`- jvmTarget = '1.8'`
	`36`	`+ jvmTarget = '17'`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ apply {`
`9`	`9`
`10`	`10`	`android {`
`11`	`11`	`namespace "com.tokbox.sample.phonecalldetection"`
`12`		`- compileSdkVersion extCompileSdkVersion`
	`12`	`+ compileSdkVersion 35`
`13`	`13`
`14`	`14`	`defaultConfig {`
`15`	`15`	`applicationId "com.tokbox.sample.phonecalldetection"`
`@@ -32,16 +32,15 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`kotlinOptions {`
`35`		`- jvmTarget = '1.8'`
	`35`	`+ jvmTarget = '17'`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`dependencies {`
`40`	`40`	`// Dependency versions are defined in the ../../commons.gradle file`
`41`		`- implementation "com.opentok.android:opentok-android-sdk:2.25.1"`
	`41`	`+ implementation "com.vonage:client-sdk-video:${extOpentokSdkVersion}"`
`42`	`42`	`implementation "androidx.appcompat:appcompat:${extAppCompatVersion}"`
`43`	`43`	`implementation "pub.devrel:easypermissions:${extEasyPermissionsVersion}"`
`44`	`44`	`implementation "androidx.constraintlayout:constraintlayout:${extConstraintLyoutVersion}"`
`45`	`45`	`implementation "androidx.core:core-ktx:+"`
`46`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"`
`47`	`46`	`}`