Port merged code from swazzler repo

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/extension/EmbraceExtensionInternal.kt

@@ -29,25 +29,16 @@ abstract class EmbraceExtensionInternal(
 
         override fun getName() = variantName
 
-        val apiToken: Property<String> = objectFactory.property(String::class.java)
-        val ndkEnabled: Property<Boolean> = objectFactory.property(Boolean::class.java)
-
         // Include properties from VariantConfiguration
         // convention(EmbraceExtensionInternal.getAppId())
-        val appId: Property<String> = objectFactory.property(String::class.java)
         val config: Property<VariantConfig> = objectFactory.property(VariantConfig::class.java)
-        val buildId: Property<String> = objectFactory.property(String::class.java)
 
         val projectType: Property<ProjectType> = objectFactory.property(ProjectType::class.java)
         val unitySymbolsDir: Property<UnitySymbolsDir?> = objectFactory.property(UnitySymbolsDir::class.java)
 
         // we need this because older gradle can not inject ObjectFactory
         fun initialize() {
-            appId.finalizeValueOnRead()
             config.finalizeValueOnRead()
-            buildId.finalizeValueOnRead()
-            apiToken.finalizeValueOnRead()
-            ndkEnabled.finalizeValueOnRead()
             projectType.finalizeValueOnRead()
             unitySymbolsDir.finalizeValueOnRead()
         }

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/extension/utils/VariantConfigurationToEmbraceExtensionInternal.kt

@@ -11,8 +11,6 @@ import io.embrace.android.gradle.plugin.tasks.il2cpp.UnitySymbolFilesManager
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 
-private const val NDK_ENABLED_DEFAULT: Boolean = true
-
 /**
  * It configures this extension with given VariantConfiguration properties.
  */
@@ -27,27 +25,7 @@ class VariantConfigurationToEmbraceExtensionInternal(
     override fun setupVariant(extension: EmbraceExtensionInternal) {
         extension.variants.named(variantInfo.name).configure {
             // properties from variant configuration
-            it.apiToken.set(
-                variantConfigProvider.map { variantConfig ->
-                    variantConfig.embraceConfig?.apiToken ?: ""
-                }
-            )
-            it.ndkEnabled.set(
-                variantConfigProvider.map { variantConfig ->
-                    variantConfig.embraceConfig?.ndkEnabled ?: NDK_ENABLED_DEFAULT
-                }
-            )
-            it.appId.set(
-                variantConfigProvider.map { variantConfig ->
-                    variantConfig.embraceConfig?.appId ?: ""
-                }
-            )
             it.config.set(variantConfigProvider)
-            it.buildId.set(
-                variantConfigProvider.map { variantConfig ->
-                    variantConfig.buildId ?: ""
-                }
-            )
 
             val symbolsDir = getSymbolsDir()
             val projectType = getProjectType(symbolsDir)

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/il2cpp/Il2CppUploadTaskRegistration.kt

@@ -130,11 +130,11 @@ class Il2CppUploadTaskRegistration : EmbraceTaskRegistration {
             task.requestParams.set(
                 project.provider {
                     RequestParams(
-                        appId = variantInfo.appId.get(),
-                        apiToken = variantInfo.apiToken.get(),
+                        appId = variantInfo.config.get().embraceConfig?.appId.orEmpty(),
+                        apiToken = variantInfo.config.get().embraceConfig?.apiToken.orEmpty(),
                         endpoint = info.endpoint,
                         fileName = info.filename,
-                        buildId = variantInfo.buildId.get(),
+                        buildId = variantInfo.config.get().buildId,
                         baseUrl = baseUrl,
                     )
                 }

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/ndk/NdkUploadTaskRegistration.kt

@@ -36,9 +36,9 @@ class NdkUploadTaskRegistration(
      */
     fun RegistrationParams.execute(): TaskProvider<NdkUploadTask>? {
         val variantExtension = extension.variants.getByName(data.name)
-        if (!variantExtension.ndkEnabled.get()) {
-            return null
-        }
+        val embraceConfig = variantExtension.config.orNull?.embraceConfig
+
+        if (embraceConfig?.ndkEnabled == false) return null
 
         val mergeNativeLibsProvider = project.provider {
             project.tryGetTaskProvider(
@@ -51,24 +51,21 @@ class NdkUploadTaskRegistration(
             NdkUploadTask::class.java,
             data
         ) { task ->
-            extension.variants.getByName(data.name).let { variantExtension ->
-                task.requestParams.set(
-                    project.provider {
-                        RequestParams(
-                            appId = variantExtension.appId.get(),
-                            apiToken = variantExtension.apiToken.get(),
-                            endpoint = EmbraceEndpoint.NDK,
-                            baseUrl = baseUrl,
-                        )
-                    }
-                )
-
-                task.generatedEmbraceResourcesDirectory.set(
-                    project.layout.buildDirectory.dir(
-                        "$GENERATED_RESOURCE_PATH/${data.name}/ndk"
+            task.requestParams.set(
+                project.provider {
+                    RequestParams(
+                        appId = embraceConfig?.appId.orEmpty(),
+                        apiToken = embraceConfig?.apiToken.orEmpty(),
+                        endpoint = EmbraceEndpoint.NDK,
+                        baseUrl = baseUrl,
                     )
-                )
-            }
+                }
+            )
+
+            task.generatedEmbraceResourcesDirectory.set(
+                project.layout.buildDirectory.dir("$GENERATED_RESOURCE_PATH/${data.name}/ndk")
+            )
+
             task.unitySymbolsDir.set(
                 variantExtension.projectType.nullSafeMap {
                     when (it) {
@@ -77,7 +74,11 @@ class NdkUploadTaskRegistration(
                     }
                 }
             )
-            task.ndkEnabled.set(variantExtension.ndkEnabled)
+            task.ndkEnabled.set(
+                variantExtension.config.map {
+                    it.embraceConfig?.ndkEnabled ?: true
+                }
+            )
             task.deobfuscatedFilesDirPath.set(
                 project.layout.buildDirectory.dir(
                     "outputs/embrace/native/mapping/${getMappingFileFolder(data.buildTypeName, data.flavorName)}"
@@ -122,9 +123,7 @@ class NdkUploadTaskRegistration(
 
         val taskContainer = project.tasks
         ndkUploadTaskProvider.configure { ndkUploadTask: NdkUploadTask ->
-
-            val ndkEnabled = variantExtension.ndkEnabled
-            ndkUploadTask.onlyIf { ndkEnabled.getOrElse(false) }
+            ndkUploadTask.onlyIf { variantExtension.config.orNull?.embraceConfig?.ndkEnabled ?: true }
             ndkUploadTask.ndkType.set(
                 variantExtension.projectType.map {
                     when (it) {

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/r8/JvmMappingUploadTaskRegistration.kt

@@ -80,11 +80,11 @@ class JvmMappingUploadTaskRegistration : EmbraceTaskRegistration {
             task.requestParams.set(
                 project.provider {
                     RequestParams(
-                        appId = variantExtension.appId.get(),
-                        apiToken = variantExtension.apiToken.get(),
+                        appId = variantExtension.config.get().embraceConfig?.appId.orEmpty(),
+                        apiToken = variantExtension.config.get().embraceConfig?.apiToken.orEmpty(),
                         endpoint = EmbraceEndpoint.PROGUARD,
                         fileName = FILE_NAME_MAPPING_TXT,
-                        buildId = variantExtension.buildId.get(),
+                        buildId = variantExtension.config.get().buildId,
                         baseUrl = baseUrl,
                     )
                 }

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/reactnative/EmbraceRnSourcemapGeneratorTaskRegistration.kt

@@ -90,8 +90,8 @@ class EmbraceRnSourcemapGeneratorTaskRegistration : EmbraceTaskRegistration {
             rnTask.requestParams.set(
                 project.provider {
                     RequestParams(
-                        appId = variantExtension.appId.get(),
-                        apiToken = variantExtension.apiToken.get(),
+                        appId = variantExtension.config.orNull?.embraceConfig?.appId.orEmpty(),
+                        apiToken = variantExtension.config.orNull?.embraceConfig?.apiToken.orEmpty(),
                         endpoint = EmbraceEndpoint.SOURCE_MAP,
                         fileName = FILE_NAME_SOURCE_MAP_JSON,
                         baseUrl = baseUrl,

embrace-gradle-plugin/src/main/java/io/embrace/android/gradle/plugin/tasks/registration/TaskRegistrar.kt

@@ -86,9 +86,9 @@ class TaskRegistrar(
             false
         } else {
             val variantExtension = embraceExtensionInternal.variants.getByName(variant.name)
-            if (variantExtension.apiToken.orNull.isNullOrEmpty()) {
+            if (variantExtension.config.orNull?.embraceConfig?.apiToken.isNullOrEmpty()) {
                 false
-            } else if (variantExtension.appId.orNull.isNullOrEmpty()) {
+            } else if (variantExtension.config.orNull?.embraceConfig?.appId.isNullOrEmpty()) {
                 false
             } else {
                 true

embrace-gradle-plugin/src/test/java/io/embrace/android/gradle/plugin/ndk/NdkUploadTaskRegistrationTest.kt

@@ -6,6 +6,8 @@ import io.embrace.android.gradle.plugin.config.UnitySymbolsDir
 import io.embrace.android.gradle.plugin.extension.EXTENSION_EMBRACE_INTERNAL
 import io.embrace.android.gradle.plugin.extension.EmbraceExtensionInternal
 import io.embrace.android.gradle.plugin.gradle.isTaskRegistered
+import io.embrace.android.gradle.plugin.instrumentation.config.model.EmbraceVariantConfig
+import io.embrace.android.gradle.plugin.instrumentation.config.model.VariantConfig
 import io.embrace.android.gradle.plugin.model.AndroidCompactedVariantData
 import io.embrace.android.gradle.plugin.network.EmbraceEndpoint
 import io.embrace.android.gradle.plugin.tasks.common.RequestParams
@@ -56,9 +58,17 @@ class NdkUploadTaskRegistrationTest {
         )
 
         extension.variants.create("variantName").also { newVariant ->
-            newVariant.appId.set("appId")
-            newVariant.apiToken.set("apiToken")
-            newVariant.ndkEnabled.set(ndkEnabled)
+            newVariant.config.set(
+                VariantConfig(
+                    embraceConfig = EmbraceVariantConfig(
+                        appId = "appId",
+                        apiToken = "apiToken",
+                        ndkEnabled = ndkEnabled,
+                        sdkConfig = null,
+                        unityConfig = null
+                    )
+                )
+            )
             newVariant.projectType.set(projectType)
             newVariant.unitySymbolsDir.set(unitySymbolsDir)
         }