From 68116f9f1f687b7484f13a13f07231a644d74647 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Tue, 26 Sep 2023 08:01:59 +0800 Subject: [PATCH] fix: when set global configure children configure "all" replaced problem --- .../plugin/config/factory/SweetPropertyConfigsFactory.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/config/factory/SweetPropertyConfigsFactory.kt b/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/config/factory/SweetPropertyConfigsFactory.kt index 9d97a5e..8d22c48 100644 --- a/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/config/factory/SweetPropertyConfigsFactory.kt +++ b/sweetproperty-gradle-plugin/src/main/java/com/highcapable/sweetproperty/plugin/config/factory/SweetPropertyConfigsFactory.kt @@ -47,12 +47,12 @@ internal fun SweetPropertyConfigureExtension.SubConfigureExtension.create( ) = object : ISweetPropertyConfigs.ISubConfigs { override val sourcesCode get() = this@create.sourcesCodeConfigure?.create(name, global.sourcesCodeConfigure, this@create.allConfigure, global.allConfigure) - ?: global.sourcesCodeConfigure?.create(name, globalBase = global.allConfigure) - ?: DefaultConfigs.subConfigs(name, global.allConfigure).sourcesCode + ?: global.sourcesCodeConfigure?.create(name, globalBase = this@create.allConfigure ?: global.allConfigure) + ?: DefaultConfigs.subConfigs(name, base = this@create.allConfigure ?: global.allConfigure).sourcesCode override val buildScript get() = this@create.buildScriptConfigure?.create(name, global.buildScriptConfigure, this@create.allConfigure, global.allConfigure) - ?: global.buildScriptConfigure?.create(name, globalBase = global.allConfigure) - ?: DefaultConfigs.subConfigs(name, global.allConfigure).buildScript + ?: global.buildScriptConfigure?.create(name, globalBase = this@create.allConfigure ?: global.allConfigure) + ?: DefaultConfigs.subConfigs(name, base = this@create.allConfigure ?: global.allConfigure).buildScript } /**