Bump kotlin from 2.1.21 to 2.2.0 (#1073)

dependabot[bot] · MGaetan89 · web-flow · commit 04b3edbd1b4b · 2025-06-25T14:24:54.000Z
Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
Co-authored-by: Gaëtan Muller &lt;m.gaetan89@gmail.com&gt;
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
@@ -4,10 +4,10 @@
  */
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
+    alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlinx.kover)
 }
 
@@ -18,7 +18,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile>().configureEach {
+kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_17
     }
diff --git a/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt b/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt
@@ -39,6 +39,7 @@ internal fun Project.configureKotlinModule() {
     tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
             jvmTarget.set(AppConfig.jvmTarget)
+            freeCompilerArgs.add("-Xannotation-default-target=param-property")
         }
     }
 }
diff --git a/docs/README.md b/docs/README.md
@@ -150,8 +150,10 @@ compileOptions {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-kotlinOptions {
-    jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
 }
 ```
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,14 +16,14 @@ androidx-test-runner = "1.6.2"
 androidx-tv-material = "1.1.0-alpha01"
 coil = "3.2.0"
 comscore = "6.11.1"
-dependency-analysis-gradle-plugin = "2.18.0"
+dependency-analysis-gradle-plugin = "2.19.0"
 desugar_jdk_libs = "2.1.5"
 detekt = "1.23.8"
 dokka = "2.0.0"
 guava = "33.3.1-android"
 json = "20250517"
 junit = "4.13.2"
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.6.2"
 kotlinx-kover = "0.9.1"
@@ -149,6 +149,7 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinx-kover" }
diff --git a/pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/commandersact/CommandersActTrackerIntegrationTest.kt b/pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/commandersact/CommandersActTrackerIntegrationTest.kt
@@ -932,7 +932,7 @@ class CommandersActTrackerIntegrationTest {
     }
 
     private companion object {
-        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"
+        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"
         private const val URN_AUDIO = "urn:rts:audio:13598743"
         private const val URN_LIVE_DVR_VIDEO = LocalMediaCompositionWithFallbackService.URN_LIVE_DVR_VIDEO
         private const val URN_NOT_LIVE_VIDEO = "urn:rts:video:8806923"
diff --git a/pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerIntegrationTest.kt b/pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerIntegrationTest.kt
@@ -673,7 +673,7 @@ class ComScoreTrackerIntegrationTest {
     // endregion
 
     private companion object {
-        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"
+        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"
         private const val URN_LIVE_DVR_VIDEO = LocalMediaCompositionWithFallbackService.URN_LIVE_DVR_VIDEO
         private const val URN_NOT_LIVE_VIDEO = "urn:rts:video:8806923"
     }
diff --git a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/data/samples/SamplesSRG.kt b/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/data/samples/SamplesSRG.kt
@@ -14,9 +14,9 @@ import ch.srgssr.pillarbox.demo.shared.data.Playlist
 object SamplesSRG {
     val OnDemandHLS = DemoItem.URL(
         title = "Sacha part à la rencontre d'univers atypiques",
-        uri = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8",
+        uri = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8",
         description = "VOD - HLS",
-        imageUri = "https://www.rts.ch/2024/06/13/11/34/14970435.image/16x9",
+        imageUri = "https://img.rts.ch/articles/2024/image/2flaad-28737013.image",
         languageTag = "fr-CH",
     )
 
diff --git a/pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt b/pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt
@@ -6,7 +6,7 @@ package ch.srgssr.pillarbox.player.utils
 
 @Suppress("MaxLineLength")
 object ContentUrls {
-    const val VOD_HLS = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"
+    const val VOD_HLS = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"
 
     // From urn:swi:video:48940210
     const val VOD_MP4 = "https://cdn.prod.swi-services.ch/video-projects/141b30ce-3850-424b-9063-a20d5619d342/localised-videos/ENG/renditions/ENG.mp4"
diff --git a/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/PlayerCallbackFlowTest.kt b/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/PlayerCallbackFlowTest.kt
@@ -230,7 +230,7 @@ class PlayerCallbackFlowTest {
     }
 
     private companion object {
-        private const val VOD = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"
+        private const val VOD = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"
         private const val LIVE = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0"
         private const val LIVE_DVR = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8"
     }
diff --git a/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/monitoring/models/ErrorMessageDataTest.kt b/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/monitoring/models/ErrorMessageDataTest.kt
@@ -159,6 +159,6 @@ class ErrorMessageDataTest {
                 ),
             )
         )
-        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"
+        private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`7`		`-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`8`	`7`
`9`	`8`	`plugins {`
`10`	`9`	`kotlin-dsl`
	`10`	`+ alias(libs.plugins.kotlin.jvm)`
`11`	`11`	`alias(libs.plugins.kotlinx.kover)`
`12`	`12`	`}`
`13`	`13`
`@@ -18,7 +18,7 @@ java {`
`18`	`18`	`targetCompatibility = JavaVersion.VERSION_17`
`19`	`19`	`}`
`20`	`20`
`21`		`-tasks.withType<KotlinCompile>().configureEach {`
	`21`	`+kotlin {`
`22`	`22`	`compilerOptions {`
`23`	`23`	`jvmTarget = JvmTarget.JVM_17`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ internal fun Project.configureKotlinModule() {`
`39`	`39`	`tasks.withType<KotlinCompile>().configureEach {`
`40`	`40`	`compilerOptions {`
`41`	`41`	`jvmTarget.set(AppConfig.jvmTarget)`
	`42`	`+ freeCompilerArgs.add("-Xannotation-default-target=param-property")`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,10 @@ compileOptions {`
`150`	`150`	`targetCompatibility = JavaVersion.VERSION_17`
`151`	`151`	`}`
`152`	`152`
`153`		`-kotlinOptions {`
`154`		`- jvmTarget = "17"`
	`153`	`+kotlin {`
	`154`	`+ compilerOptions {`
	`155`	`+ jvmTarget = JvmTarget.JVM_17`
	`156`	`+ }`
`155`	`157`	`}`
`156`	`158`	```
`157`	`159`
Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ class CommandersActTrackerIntegrationTest {`
`932`	`932`	`}`
`933`	`933`
`934`	`934`	`private companion object {`
`935`		`- private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"`
	`935`	`+ private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"`
`936`	`936`	`private const val URN_AUDIO = "urn:rts:audio:13598743"`
`937`	`937`	`private const val URN_LIVE_DVR_VIDEO = LocalMediaCompositionWithFallbackService.URN_LIVE_DVR_VIDEO`
`938`	`938`	`private const val URN_NOT_LIVE_VIDEO = "urn:rts:video:8806923"`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ class ComScoreTrackerIntegrationTest {`
`673`	`673`	`// endregion`
`674`	`674`
`675`	`675`	`private companion object {`
`676`		`- private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"`
	`676`	`+ private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"`
`677`	`677`	`private const val URN_LIVE_DVR_VIDEO = LocalMediaCompositionWithFallbackService.URN_LIVE_DVR_VIDEO`
`678`	`678`	`private const val URN_NOT_LIVE_VIDEO = "urn:rts:video:8806923"`
`679`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ class PlayerCallbackFlowTest {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`private companion object {`
`233`		`- private const val VOD = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"`
	`233`	`+ private const val VOD = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"`
`234`	`234`	`private const val LIVE = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0"`
`235`	`235`	`private const val LIVE_DVR = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8"`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,6 @@ class ErrorMessageDataTest {`
`159`	`159`	`),`
`160`	`160`	`)`
`161`	`161`	`)`
`162`		`- private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/96fc7429-64c1-34b0-8c05-62cf114695ac/master.m3u8"`
	`162`	`+ private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/4dcba1d3-8cc8-3667-a7d2-b3b92c4243d9/master.m3u8"`
`163`	`163`	`}`
`164`	`164`	`}`