#496 - build fixes & jdk21

siliconeagle · siliconeagle · commit b97abc1538d4 · 2025-07-21T12:40:52.000+02:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -76,8 +76,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_17)
-        targetCompatibility(JavaVersion.VERSION_17)
+        sourceCompatibility(JavaVersion.VERSION_21)
+        targetCompatibility(JavaVersion.VERSION_21)
     }
 
     kotlinOptions {
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
@@ -2,7 +2,7 @@
 <!-- This file is generated from the build.gradle.kts-->
 <network-security-config>
 
-    <domain-config cleartextTrafficPermitted="true">
+   <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="false">192.168.0.1</domain>
         <domain includeSubdomains="false">192.168.0.2</domain>
         <domain includeSubdomains="false">192.168.0.3</domain>
@@ -512,4 +512,4 @@
         <domain includeSubdomains="false">192.168.1.253</domain>
         <domain includeSubdomains="false">192.168.1.254</domain>
     </domain-config>
-</network-security-config>
+</network-security-config>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -43,6 +43,9 @@ plugins {
 
 // Apply tasks to all projects
 allprojects {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.jvmTarget = libs.versions.jvm.get()
+    }
     tasks.create("setProductionFlag") {
         doFirst {
             val taskName = project.gradle.taskGraph.allTasks.last().toString()
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -25,6 +25,8 @@ val ver_ios_deploy_target: String by project
 
 kotlin {
     jvm()
+    jvmToolchain(libs.versions.jvm.get().toInt())
+
     androidTarget {
         compilations.all {
             kotlinOptions.jvmTarget = libs.versions.jvm.get()
@@ -132,8 +134,8 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -11,6 +11,8 @@ version = "1.0"
 
 kotlin {
     jvm()
+    jvmToolchain(libs.versions.jvm.get().toInt())
+
     js(IR) {
         browser()
     }
@@ -119,7 +121,7 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
diff --git a/domain/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/domain/ext/PlaylistDomainExtKtTest.kt b/domain/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/domain/ext/PlaylistDomainExtKtTest.kt
@@ -7,6 +7,7 @@ import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Identifier
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL
 import uk.co.sentinelweb.cuer.domain.MediaDomain
 import uk.co.sentinelweb.cuer.domain.PlaylistDomain
+import uk.co.sentinelweb.cuer.domain.PlaylistDomain.PlaylistTypeDomain.USER
 import uk.co.sentinelweb.cuer.domain.PlaylistItemDomain
 import uk.co.sentinelweb.cuer.domain.creator.GuidCreator
 
@@ -25,15 +26,15 @@ class PlaylistDomainExtKtTest {
         Identifier(guidCreator.create(), LOCAL),
     )
     private val nodes = listOf(
-        PlaylistDomain(ids[0]/*2*/, "1", parentId = null),
-        PlaylistDomain(ids[1]/*3*/, "11", parentId = ids[0]),
-        PlaylistDomain(ids[2]/*4*/, "111", parentId = ids[1]),
-        PlaylistDomain(ids[3]/*5*/, "2", parentId = null),
-        PlaylistDomain(ids[4]/*6*/, "21", parentId = ids[3]),
-        PlaylistDomain(ids[5]/*7*/, "211", parentId = ids[4]),
-        PlaylistDomain(ids[6]/*8*/, "212", parentId = ids[4]),
-        PlaylistDomain(ids[7]/*9*/, "2121", parentId = ids[6]),
-        PlaylistDomain(ids[8]/*10*/, "3", parentId = null),
+        PlaylistDomain(ids[0]/*2*/, "1", parentId = null, type= USER),
+        PlaylistDomain(ids[1]/*3*/, "11", parentId = ids[0], type= USER),
+        PlaylistDomain(ids[2]/*4*/, "111", parentId = ids[1], type= USER),
+        PlaylistDomain(ids[3]/*5*/, "2", parentId = null, type= USER),
+        PlaylistDomain(ids[4]/*6*/, "21", parentId = ids[3], type= USER),
+        PlaylistDomain(ids[5]/*7*/, "211", parentId = ids[4], type= USER),
+        PlaylistDomain(ids[6]/*8*/, "212", parentId = ids[4], type= USER),
+        PlaylistDomain(ids[7]/*9*/, "2121", parentId = ids[6], type= USER),
+        PlaylistDomain(ids[8]/*10*/, "3", parentId = null, type= USER),
     )
 
     private val tree = nodes.buildTree()
diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,6 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 isProduction=false
 CUER_BG_PLAY=true
 CUER_REMOTE_ENABLED=true
-ver_firebase_bom=26.1.1
-ver_firebase_ui=7.1.1
 #org.jetbrains.compose.desktop.rendering.onlySoftwareRendering=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.mpp.enableCInteropCommonization=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,8 +5,8 @@ app-versionCode = "12"
 app-versionName = "0.79"
 # todo change to 1.9.23
 kotlin = "2.1.21"
-jdk = "17"
-jvm = "17"
+jdk = "21"
+jvm = "21"
 agp = "8.10.0"
 android-compileSdk = "35"
 android-minSdk = "26"
diff --git a/hub/build.gradle.kts b/hub/build.gradle.kts
@@ -17,6 +17,9 @@ val CUER_HUB_STORE_PASS: String by project
 group = "uk.co.sentinlweb.cuer"
 version = "1.0-SNAPSHOT"
 
+kotlin{
+    jvmToolchain(libs.versions.jvm.get().toInt())
+}
 dependencies {
     // Note, if you develop a library, you should use compose.desktop.common.
     // compose.desktop.currentOs should be used in launcher-sourceSet
@@ -75,8 +78,8 @@ tasks {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.create<JavaExec>("runTestMain") {
diff --git a/net/build.gradle.kts b/net/build.gradle.kts
@@ -11,6 +11,8 @@ version = "1.0"
 
 kotlin {
     jvm()
+    jvmToolchain(libs.versions.jvm.get().toInt())
+
     js(IR) {
         browser()
     }
@@ -127,7 +129,7 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
diff --git a/net/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/net/pixabay/PixabayKtorInteractorApiTest.kt b/net/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/net/pixabay/PixabayKtorInteractorApiTest.kt
@@ -6,6 +6,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
+import uk.co.sentinelweb.cuer.app.db.repository.file.PlatformFileOperation
 import uk.co.sentinelweb.cuer.core.providers.CoroutineContextProvider
 import uk.co.sentinelweb.cuer.core.wrapper.ConnectivityWrapper
 import uk.co.sentinelweb.cuer.core.wrapper.SystemLogWrapper
@@ -15,6 +16,8 @@ import uk.co.sentinelweb.cuer.net.client.ErrorMapper
 import uk.co.sentinelweb.cuer.net.client.KtorClientBuilder
 import uk.co.sentinelweb.cuer.net.client.ServiceExecutor
 import uk.co.sentinelweb.cuer.net.client.ServiceType
+import uk.co.sentinelweb.cuer.net.file.AndroidPlatformFileStreamOperations
+import uk.co.sentinelweb.cuer.net.file.PlatformFileStreamOperations
 import uk.co.sentinelweb.cuer.net.pixabay.mapper.PixabayImageMapper
 
 
@@ -37,16 +40,25 @@ class PixabayKtorInteractorApiTest {
 
     private val log = SystemLogWrapper()
     private val config = NetModuleConfig(debug = true)
+
+    private val operation = PlatformFileOperation()
     private val connectivityWrapper = object : ConnectivityWrapper {
         override fun isConnected() = true
         override fun isMetered() = true
     }
     private lateinit var sut: PixabayInteractor
 
+
     @Before
     fun setUp() {
         val clientBuilder = KtorClientBuilder()
-        val serviceExecutor = ServiceExecutor(clientBuilder.build(config, log), ServiceType.PIXABAY, log)
+        val serviceExecutor = ServiceExecutor(
+            clientBuilder.build(config, log),
+            ServiceType.PIXABAY,
+            operation,
+            fileStreamOperation = AndroidPlatformFileStreamOperations(operation),
+            log = log,
+        )
         service = PixabayService(serviceExecutor)
 
         sut = PixabayKtorInteractor(
diff --git a/net/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/net/youtube/videos/YoutubeVideosKtorInteractorApiTest.kt b/net/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/net/youtube/videos/YoutubeVideosKtorInteractorApiTest.kt
@@ -5,6 +5,7 @@ import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
+import uk.co.sentinelweb.cuer.app.db.repository.file.PlatformFileOperation
 import uk.co.sentinelweb.cuer.core.mappers.TimeStampMapper
 import uk.co.sentinelweb.cuer.core.providers.CoroutineContextProvider
 import uk.co.sentinelweb.cuer.core.providers.TimeProviderImpl
@@ -18,6 +19,7 @@ import uk.co.sentinelweb.cuer.net.client.ErrorMapper
 import uk.co.sentinelweb.cuer.net.client.KtorClientBuilder
 import uk.co.sentinelweb.cuer.net.client.ServiceExecutor
 import uk.co.sentinelweb.cuer.net.client.ServiceType
+import uk.co.sentinelweb.cuer.net.file.AndroidPlatformFileStreamOperations
 import uk.co.sentinelweb.cuer.net.mappers.EscapeEntityMapper
 import uk.co.sentinelweb.cuer.net.youtube.YoutubeInteractor
 import uk.co.sentinelweb.cuer.net.youtube.YoutubeService
@@ -49,12 +51,21 @@ class YoutubeVideosKtorInteractorApiTest {
         override fun isMetered() = true
     }
     private val imageMapper = YoutubeImageMapper()
+
+
+    private val operation = PlatformFileOperation()
     private lateinit var sut: YoutubeInteractor
 
     @Before
     fun setUp() {
         val clientBuilder = KtorClientBuilder()
-        val serviceExecutor = ServiceExecutor(clientBuilder.build(config, log), ServiceType.YOUTUBE, log)
+        val serviceExecutor = ServiceExecutor(
+            clientBuilder.build(config, log),
+            ServiceType.PIXABAY,
+            operation,
+            fileStreamOperation = AndroidPlatformFileStreamOperations(operation),
+            log = log,
+        )
         service = YoutubeService(serviceExecutor)
         val channelMapper = YoutubeChannelDomainMapper(TimeStampMapper(log), imageMapper)
         sut = YoutubeKtorInteractor(
diff --git a/remote/build.gradle.kts b/remote/build.gradle.kts
@@ -18,6 +18,8 @@ version = "1.0"
 
 kotlin {
     jvm()
+    jvmToolchain(libs.versions.jvm.get().toInt())
+
     js(IR) {
         useCommonJs()
         browser {
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -24,6 +24,7 @@ kotlin {
         }
     }
     jvm("desktop")
+    jvmToolchain(libs.versions.jvm.get().toInt())
     js(IR) {
         browser()
     }
@@ -163,8 +164,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 //

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ android {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`compileOptions {`
`79`		`- sourceCompatibility(JavaVersion.VERSION_17)`
`80`		`- targetCompatibility(JavaVersion.VERSION_17)`
	`79`	`+ sourceCompatibility(JavaVersion.VERSION_21)`
	`80`	`+ targetCompatibility(JavaVersion.VERSION_21)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`kotlinOptions {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ val ver_ios_deploy_target: String by project`
`25`	`25`
`26`	`26`	`kotlin {`
`27`	`27`	`jvm()`
	`28`	`+ jvmToolchain(libs.versions.jvm.get().toInt())`
	`29`	`+`
`28`	`30`	`androidTarget {`
`29`	`31`	`compilations.all {`
`30`	`32`	`kotlinOptions.jvmTarget = libs.versions.jvm.get()`
`@@ -132,8 +134,8 @@ android {`
`132`	`134`	`minSdk = libs.versions.android.minSdk.get().toInt()`
`133`	`135`	`}`
`134`	`136`	`compileOptions {`
`135`		`- sourceCompatibility = JavaVersion.VERSION_17`
`136`		`- targetCompatibility = JavaVersion.VERSION_17`
	`137`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`138`	`+ targetCompatibility = JavaVersion.VERSION_21`
`137`	`139`	`}`
`138`	`140`	`}`
`139`	`141`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ version = "1.0"`
`11`	`11`
`12`	`12`	`kotlin {`
`13`	`13`	`jvm()`
	`14`	`+ jvmToolchain(libs.versions.jvm.get().toInt())`
	`15`	`+`
`14`	`16`	`js(IR) {`
`15`	`17`	`browser()`
`16`	`18`	`}`
`@@ -119,7 +121,7 @@ android {`
`119`	`121`	`minSdk = libs.versions.android.minSdk.get().toInt()`
`120`	`122`	`}`
`121`	`123`	`compileOptions {`
`122`		`- sourceCompatibility = JavaVersion.VERSION_17`
`123`		`- targetCompatibility = JavaVersion.VERSION_17`
	`124`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`125`	`+ targetCompatibility = JavaVersion.VERSION_21`
`124`	`126`	`}`
`125`	`127`	`}`