fix: ksp issue with kotlin 2.0.20

google/ksp#2072
valerii-fr · Sep 1, 2024 · 57c5e62 · 57c5e62
1 parent ff5f0a0
commit 57c5e62
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 12 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/dev/nordix/resourcesharing/di/AppModule.kt b/app/src/main/java/dev/nordix/resourcesharing/di/AppModule.kt
@@ -0,0 +1,25 @@
+package dev.nordix.resourcesharing.di
+
+import androidx.test.espresso.core.internal.deps.dagger.Provides
+import androidx.test.espresso.core.internal.deps.dagger.multibindings.IntoSet
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dev.nordix.core.annotations.OnApplicationCreated
+import dev.nordix.discovery.domain.DiscoveryService
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AppModule {
+
+    @Provides
+    @Singleton
+    @IntoSet
+    fun provideOnAppCreated(
+        discoveryService: DiscoveryService
+    ): OnApplicationCreated  = OnApplicationCreated {
+        discoveryService.startRootServiceLookup()
+    }
+
+}
diff --git a/common_ui/build.gradle.kts b/common_ui/build.gradle.kts
@@ -5,6 +5,11 @@ plugins {
 }
 
 android {
+
+    defaultConfig {
+        multiDexEnabled = true
+    }
+
     namespace = "dev.nordix.common_ui"
     compileSdk = 34
     compileOptions {
@@ -35,6 +40,7 @@ kotlin {
 }
 
 dependencies {
+    implementation(libs.androidx.multidex)
     coreLibraryDesugaring(libs.coreLibraryDesugaring)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

diff --git a/component/network/discovery/src/main/java/dev/nordix/discovery/di/DiscoveryModule.kt b/component/network/discovery/src/main/java/dev/nordix/discovery/di/DiscoveryModule.kt
@@ -49,13 +49,4 @@ internal class DiscoveryModule {
         discoveryListener = discoveryListener,
     )
 
-    @Provides
-    @Singleton
-    @IntoSet
-    fun provideOnAppCreated(
-        discoveryService: DiscoveryService,
-    ) : OnApplicationCreated = OnApplicationCreated {
-        discoveryService.startRootServiceLookup()
-    }
-
 }
diff --git a/.../service_manager/src/main/java/dev/nordix/service_manager/holder/ServicesStateProvider.kt b/.../service_manager/src/main/java/dev/nordix/service_manager/holder/ServicesStateProvider.kt
@@ -1,6 +1,7 @@
 package dev.nordix.service_manager.holder
 
 import android.net.nsd.NsdServiceInfo
+import android.util.Log
 import dev.nordix.service_manager.domain.model.DiscoveryState
 import dev.nordix.service_manager.domain.model.ServiceState
 import dev.nordix.service_manager.domain.model.ServicesStateHolder
@@ -13,7 +14,10 @@ class ServicesStateProvider(
     val holder: MutableStateFlow<ServicesStateHolder> = MutableStateFlow(ServicesStateHolder())
 ) : MutableStateFlow<ServicesStateHolder> by holder {
 
+    private val tag = this::class.simpleName
+
     fun onStartDiscoveryFailed(serviceType: String?, errorCode: Int) {
+        Log.e(tag, "onStartDiscoveryFailed: serviceType = $serviceType, errorCode = $errorCode")
         update { state ->
             val serviceTypeIndex = state.discoveryStates.indexOfFirst { it.type == serviceType }
             if (serviceTypeIndex > -1) {
@@ -28,6 +32,7 @@ class ServicesStateProvider(
     }
 
     fun onStopDiscoveryFailed(serviceType: String?, errorCode: Int) {
+        Log.e(tag, "onStopDiscoveryFailed: serviceType = $serviceType, errorCode = $errorCode")
         update { state ->
             val serviceTypeIndex = state.discoveryStates.indexOfFirst { it.type == serviceType }
             if (serviceTypeIndex > -1) {
@@ -42,6 +47,7 @@ class ServicesStateProvider(
     }
 
     fun onDiscoveryStarted(serviceType: String?) {
+        Log.e(tag, "onDiscoveryStarted: serviceType = $serviceType")
         update { state ->
             val serviceTypeIndex = state.discoveryStates.indexOfFirst { it.type == serviceType }
             if (serviceTypeIndex > 1) {
@@ -56,6 +62,7 @@ class ServicesStateProvider(
     }
 
     fun onDiscoveryStopped(serviceType: String?) {
+        Log.e(tag, "onDiscoveryStopped: serviceType = $serviceType")
         update { state ->
             val serviceTypeIndex = state.discoveryStates.indexOfFirst { it.type == serviceType }
             if (serviceTypeIndex > -1 ) {
@@ -70,6 +77,7 @@ class ServicesStateProvider(
     }
 
     fun onServiceFound(serviceInfo: NsdServiceInfo?) {
+        Log.e(tag, "onServiceFound: serviceInfo = $serviceInfo")
         serviceInfo?.let {
             update { state ->
                 state.copy(
@@ -87,6 +95,7 @@ class ServicesStateProvider(
     }
 
     fun onServiceLost(serviceInfo: NsdServiceInfo?) {
+        Log.e(tag, "onServiceLost: serviceInfo = $serviceInfo")
         serviceInfo?.let {
             val domainServiceInfo = serviceInfo.toFoundServiceInfo()
             update { state ->

diff --git a/component/services/build.gradle.kts b/component/services/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
 android {
     namespace = "dev.nordix.services"
     compileSdk = 34
+
+    defaultConfig {
+        multiDexEnabled = true
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -36,6 +40,8 @@ kotlin {
 
 dependencies {
     implementation(project(":core"))
+
+    implementation(libs.androidx.multidex)
     coreLibraryDesugaring(libs.coreLibraryDesugaring)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
 android {
     namespace = "dev.nordix.core"
     compileSdk = 34
+
+    defaultConfig {
+        multiDexEnabled = true
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -35,6 +39,7 @@ kotlin {
 }
 
 dependencies {
+    implementation(libs.androidx.multidex)
     coreLibraryDesugaring(libs.coreLibraryDesugaring)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.4.2"
-kotlin = "2.0.20"
+kotlin = "2.0.10"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -10,13 +10,15 @@ activityCompose = "1.9.1"
 composeBom = "2024.08.00"
 hilt = "2.51"
 hilt_navigation = "1.2.0"
-ksp = "2.0.20-1.0.24"
+ksp = "2.0.10-1.0.24"
+multidex = "2.0.1"
 permissions = "0.35.2-beta"
 appcompat = "1.7.0"
 material = "1.12.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }