|
|
@ -20,7 +20,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet |
|
|
|
import org.jetbrains.kotlin.gradle.plugin.extraProperties |
|
|
|
import org.jetbrains.kotlin.gradle.plugin.extraProperties |
|
|
|
import java.io.File |
|
|
|
import java.io.File |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
internal const val COMPOSE_RESOURCES_DIR = "composeResources" |
|
|
|
internal const val COMPOSE_RESOURCES_DIR = "composeResources" |
|
|
|
internal const val RES_GEN_DIR = "generated/compose/resourceGenerator" |
|
|
|
internal const val RES_GEN_DIR = "generated/compose/resourceGenerator" |
|
|
|
private const val KMP_RES_EXT = "multiplatformResourcesPublication" |
|
|
|
private const val KMP_RES_EXT = "multiplatformResourcesPublication" |
|
|
@ -47,6 +46,7 @@ private fun Project.onKgpApplied(config: Provider<ResourcesExtension>, kgp: Kotl |
|
|
|
|
|
|
|
|
|
|
|
if (kmpResourcesAreAvailable) { |
|
|
|
if (kmpResourcesAreAvailable) { |
|
|
|
configureKmpResources(kotlinExtension, extraProperties.get(KMP_RES_EXT)!!, config) |
|
|
|
configureKmpResources(kotlinExtension, extraProperties.get(KMP_RES_EXT)!!, config) |
|
|
|
|
|
|
|
onAgpApplied { fixAndroidLintTaskDependencies() } |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (!disableMultimoduleResources) { |
|
|
|
if (!disableMultimoduleResources) { |
|
|
|
if (!hasKmpResources) logger.info( |
|
|
|
if (!hasKmpResources) logger.info( |
|
|
@ -66,35 +66,24 @@ private fun Project.onKgpApplied(config: Provider<ResourcesExtension>, kgp: Kotl |
|
|
|
val commonMain = KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME |
|
|
|
val commonMain = KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME |
|
|
|
configureComposeResources(kotlinExtension, commonMain, config) |
|
|
|
configureComposeResources(kotlinExtension, commonMain, config) |
|
|
|
|
|
|
|
|
|
|
|
//when applied AGP then configure android resources |
|
|
|
onAgpApplied { androidExtension -> |
|
|
|
androidPluginIds.forEach { pluginId -> |
|
|
|
configureAndroidComposeResources(kotlinExtension, androidExtension) |
|
|
|
plugins.withId(pluginId) { |
|
|
|
fixAndroidLintTaskDependencies() |
|
|
|
val androidExtension = project.extensions.getByType(BaseExtension::class.java) |
|
|
|
|
|
|
|
configureAndroidComposeResources(kotlinExtension, androidExtension) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|
|
|
|
There is a dirty fix for the problem: |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Reason: Task ':generateDemoDebugUnitTestLintModel' uses this output of task ':generateResourceAccessorsForAndroidUnitTest' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Possible solutions: |
|
|
|
|
|
|
|
1. Declare task ':generateResourceAccessorsForAndroidUnitTest' as an input of ':generateDemoDebugUnitTestLintModel'. |
|
|
|
|
|
|
|
2. Declare an explicit dependency on ':generateResourceAccessorsForAndroidUnitTest' from ':generateDemoDebugUnitTestLintModel' using Task#dependsOn. |
|
|
|
|
|
|
|
3. Declare an explicit dependency on ':generateResourceAccessorsForAndroidUnitTest' from ':generateDemoDebugUnitTestLintModel' using Task#mustRunAfter. |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
tasks.matching { |
|
|
|
|
|
|
|
it is AndroidLintAnalysisTask || it is LintModelWriterTask |
|
|
|
|
|
|
|
}.configureEach { |
|
|
|
|
|
|
|
it.mustRunAfter(tasks.withType(GenerateResourceAccessorsTask::class.java)) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
configureSyncIosComposeResources(kotlinExtension) |
|
|
|
configureSyncIosComposeResources(kotlinExtension) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun Project.onAgpApplied(block: (androidExtension: BaseExtension) -> Unit) { |
|
|
|
|
|
|
|
androidPluginIds.forEach { pluginId -> |
|
|
|
|
|
|
|
plugins.withId(pluginId) { |
|
|
|
|
|
|
|
val androidExtension = project.extensions.getByType(BaseExtension::class.java) |
|
|
|
|
|
|
|
block(androidExtension) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun Project.onKotlinJvmApplied(config: Provider<ResourcesExtension>) { |
|
|
|
private fun Project.onKotlinJvmApplied(config: Provider<ResourcesExtension>) { |
|
|
|
val kotlinExtension = project.extensions.getByType(KotlinProjectExtension::class.java) |
|
|
|
val kotlinExtension = project.extensions.getByType(KotlinProjectExtension::class.java) |
|
|
|
val main = SourceSet.MAIN_SOURCE_SET_NAME |
|
|
|
val main = SourceSet.MAIN_SOURCE_SET_NAME |
|
|
|