From 4cef244d71c4891c53cbfca2cefe5685b2651460 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 31 Mar 2022 13:23:21 +0530 Subject: [PATCH] build: improve compatibility with Android Studio --- common/build.gradle.kts | 1 + database/build.gradle.kts | 5 ++++- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 75507cf1..097e623a 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -31,6 +31,7 @@ kotlin { implementation(libs.androidx.browser) implementation(libs.coil.compose) } + dependsOn(sourceSets["androidAndroidTestRelease"]) } sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } } } diff --git a/database/build.gradle.kts b/database/build.gradle.kts index d1a4b587..ef75e431 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -15,7 +15,10 @@ kotlin { kotlinOptions.freeCompilerArgs + listOf("-Xopt-in=kotlin.RequiresOptIn") } } - sourceSets["androidMain"].apply { dependencies { implementation(libs.sqldelight.androidDriver) } } + sourceSets["androidMain"].apply { + dependencies { implementation(libs.sqldelight.androidDriver) } + dependsOn(sourceSets["androidAndroidTestRelease"]) + } sourceSets["desktopMain"].apply { dependencies { implementation(libs.sqldelight.jvmDriver) } } sourceSets["desktopTest"].apply { dependencies { diff --git a/gradle.properties b/gradle.properties index 96a75f5e..00a680ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ android.enableR8.fullMode=true android.useAndroidX=true # Kotlin Multiplatform -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.enableGranularSourceSetsMetadata=false kotlin.native.enableDependencyPropagation=false kotlin.mpp.stability.nowarn=true