From 692c6514fcac6804c0a24db8bd81c775842c5e9b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 26 Feb 2026 15:28:32 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 core/datasource/build.gradle.kts                  | 15 +++++++--------
 .../configurations/EnvironmentConfigGenerator.kt  | 11 +++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
index 7e80091db4..353cb3f5ab 100644
--- a/core/datasource/build.gradle.kts
+++ b/core/datasource/build.gradle.kts
@@ -32,8 +32,6 @@ abstract class GenerateEnvironmentConfigTask : DefaultTask() {
 android {
     namespace = "com.tangem.datasource"
 
-    sourceSets["main"].java.srcDir(layout.buildDirectory.dir("generated/source/environment-config"))
-
     room {
         schemaDirectory("$projectDir/schemas")
     }
@@ -46,17 +44,18 @@ androidComponents {
             "app/src/main/assets/tangem-app-config/config_${buildType.environment}.json",
         )
 
-        tasks.register<GenerateEnvironmentConfigTask>(
+        val taskProvider = tasks.register<GenerateEnvironmentConfigTask>(
             "generateEnvironmentConfig${variant.name.replaceFirstChar { it.uppercaseChar() }}",
         ) {
             this.configFile.set(configFile)
-            outputDir.set(layout.buildDirectory.dir("generated/source/environment-config"))
+            outputDir.set(layout.buildDirectory.dir("generated/source/environment-config/${variant.name}"))
+            doFirst {
+                logger.lifecycle("[Environment config] Running: ${this.name}")
+            }
         }
-    }
-}
 
-tasks.named("preBuild") {
-    dependsOn(tasks.matching { it.name.startsWith("generateEnvironmentConfig") })
+        variant.sources.java?.addGeneratedSourceDirectory(taskProvider, GenerateEnvironmentConfigTask::outputDir)
+    }
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/EnvironmentConfigGenerator.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/EnvironmentConfigGenerator.kt
index 89206fda87..5c6d9e6e79 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/EnvironmentConfigGenerator.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/EnvironmentConfigGenerator.kt
@@ -73,14 +73,9 @@ object EnvironmentConfigGenerator {
                 when {
                     value.isString -> {
                         val stringValue = value.content
-                        val isNullable = stringValue.isEmpty()
-                        val propertySpec = PropertySpec.builder(name, STRING.copy(nullable = isNullable))
-                            .initializer(if (isNullable) "null" else "%S", stringValue)
-
-                        // Add const modifier for non-nullable strings
-                        if (!isNullable) {
-                            propertySpec.addModifiers(KModifier.CONST)
-                        }
+                        val propertySpec = PropertySpec.builder(name, STRING)
+                            .addModifiers(KModifier.CONST)
+                            .initializer("%S", stringValue)
 
                         builder.addProperty(propertySpec.build())
                     }