Skip to content

Commit a3a3a11

Browse files
fractalwrenchfractalwrench
authored
Merge pull request #1891 from embrace-io/port-code
Port merged code from swazzler repo
2 parents 79e76f8 + 5efdc5c commit a3a3a11

File tree

8 files changed

+46
-68
lines changed

8 files changed

+46
-68
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,16 @@ abstract class EmbraceExtensionInternal(
2929

3030
override fun getName() = variantName
3131

32-
val apiToken: Property<String> = objectFactory.property(String::class.java)
33-
val ndkEnabled: Property<Boolean> = objectFactory.property(Boolean::class.java)
34-
3532
// Include properties from VariantConfiguration
3633
// convention(EmbraceExtensionInternal.getAppId())
37-
val appId: Property<String> = objectFactory.property(String::class.java)
3834
val config: Property<VariantConfig> = objectFactory.property(VariantConfig::class.java)
39-
val buildId: Property<String> = objectFactory.property(String::class.java)
4035

4136
val projectType: Property<ProjectType> = objectFactory.property(ProjectType::class.java)
4237
val unitySymbolsDir: Property<UnitySymbolsDir?> = objectFactory.property(UnitySymbolsDir::class.java)
4338

4439
// we need this because older gradle can not inject ObjectFactory
4540
fun initialize() {
46-
appId.finalizeValueOnRead()
4741
config.finalizeValueOnRead()
48-
buildId.finalizeValueOnRead()
49-
apiToken.finalizeValueOnRead()
50-
ndkEnabled.finalizeValueOnRead()
5142
projectType.finalizeValueOnRead()
5243
unitySymbolsDir.finalizeValueOnRead()
5344
}

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import io.embrace.android.gradle.plugin.tasks.il2cpp.UnitySymbolFilesManager
1111
import org.gradle.api.Project
1212
import org.gradle.api.provider.Provider
1313

14-
private const val NDK_ENABLED_DEFAULT: Boolean = true
15-
1614
/**
1715
* It configures this extension with given VariantConfiguration properties.
1816
*/
@@ -27,27 +25,7 @@ class VariantConfigurationToEmbraceExtensionInternal(
2725
override fun setupVariant(extension: EmbraceExtensionInternal) {
2826
extension.variants.named(variantInfo.name).configure {
2927
// properties from variant configuration
30-
it.apiToken.set(
31-
variantConfigProvider.map { variantConfig ->
32-
variantConfig.embraceConfig?.apiToken ?: ""
33-
}
34-
)
35-
it.ndkEnabled.set(
36-
variantConfigProvider.map { variantConfig ->
37-
variantConfig.embraceConfig?.ndkEnabled ?: NDK_ENABLED_DEFAULT
38-
}
39-
)
40-
it.appId.set(
41-
variantConfigProvider.map { variantConfig ->
42-
variantConfig.embraceConfig?.appId ?: ""
43-
}
44-
)
4528
it.config.set(variantConfigProvider)
46-
it.buildId.set(
47-
variantConfigProvider.map { variantConfig ->
48-
variantConfig.buildId ?: ""
49-
}
50-
)
5129

5230
val symbolsDir = getSymbolsDir()
5331
val projectType = getProjectType(symbolsDir)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ class Il2CppUploadTaskRegistration : EmbraceTaskRegistration {
130130
task.requestParams.set(
131131
project.provider {
132132
RequestParams(
133-
appId = variantInfo.appId.get(),
134-
apiToken = variantInfo.apiToken.get(),
133+
appId = variantInfo.config.get().embraceConfig?.appId.orEmpty(),
134+
apiToken = variantInfo.config.get().embraceConfig?.apiToken.orEmpty(),
135135
endpoint = info.endpoint,
136136
fileName = info.filename,
137-
buildId = variantInfo.buildId.get(),
137+
buildId = variantInfo.config.get().buildId,
138138
baseUrl = baseUrl,
139139
)
140140
}

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class NdkUploadTaskRegistration(
3636
*/
3737
fun RegistrationParams.execute(): TaskProvider<NdkUploadTask>? {
3838
val variantExtension = extension.variants.getByName(data.name)
39-
if (!variantExtension.ndkEnabled.get()) {
40-
return null
41-
}
39+
val embraceConfig = variantExtension.config.orNull?.embraceConfig
40+
41+
if (embraceConfig?.ndkEnabled == false) return null
4242

4343
val mergeNativeLibsProvider = project.provider {
4444
project.tryGetTaskProvider(
@@ -51,24 +51,21 @@ class NdkUploadTaskRegistration(
5151
NdkUploadTask::class.java,
5252
data
5353
) { task ->
54-
extension.variants.getByName(data.name).let { variantExtension ->
55-
task.requestParams.set(
56-
project.provider {
57-
RequestParams(
58-
appId = variantExtension.appId.get(),
59-
apiToken = variantExtension.apiToken.get(),
60-
endpoint = EmbraceEndpoint.NDK,
61-
baseUrl = baseUrl,
62-
)
63-
}
64-
)
65-
66-
task.generatedEmbraceResourcesDirectory.set(
67-
project.layout.buildDirectory.dir(
68-
"$GENERATED_RESOURCE_PATH/${data.name}/ndk"
54+
task.requestParams.set(
55+
project.provider {
56+
RequestParams(
57+
appId = embraceConfig?.appId.orEmpty(),
58+
apiToken = embraceConfig?.apiToken.orEmpty(),
59+
endpoint = EmbraceEndpoint.NDK,
60+
baseUrl = baseUrl,
6961
)
70-
)
71-
}
62+
}
63+
)
64+
65+
task.generatedEmbraceResourcesDirectory.set(
66+
project.layout.buildDirectory.dir("$GENERATED_RESOURCE_PATH/${data.name}/ndk")
67+
)
68+
7269
task.unitySymbolsDir.set(
7370
variantExtension.projectType.nullSafeMap {
7471
when (it) {
@@ -77,7 +74,11 @@ class NdkUploadTaskRegistration(
7774
}
7875
}
7976
)
80-
task.ndkEnabled.set(variantExtension.ndkEnabled)
77+
task.ndkEnabled.set(
78+
variantExtension.config.map {
79+
it.embraceConfig?.ndkEnabled ?: true
80+
}
81+
)
8182
task.deobfuscatedFilesDirPath.set(
8283
project.layout.buildDirectory.dir(
8384
"outputs/embrace/native/mapping/${getMappingFileFolder(data.buildTypeName, data.flavorName)}"
@@ -122,9 +123,7 @@ class NdkUploadTaskRegistration(
122123

123124
val taskContainer = project.tasks
124125
ndkUploadTaskProvider.configure { ndkUploadTask: NdkUploadTask ->
125-
126-
val ndkEnabled = variantExtension.ndkEnabled
127-
ndkUploadTask.onlyIf { ndkEnabled.getOrElse(false) }
126+
ndkUploadTask.onlyIf { variantExtension.config.orNull?.embraceConfig?.ndkEnabled ?: true }
128127
ndkUploadTask.ndkType.set(
129128
variantExtension.projectType.map {
130129
when (it) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ class JvmMappingUploadTaskRegistration : EmbraceTaskRegistration {
8080
task.requestParams.set(
8181
project.provider {
8282
RequestParams(
83-
appId = variantExtension.appId.get(),
84-
apiToken = variantExtension.apiToken.get(),
83+
appId = variantExtension.config.get().embraceConfig?.appId.orEmpty(),
84+
apiToken = variantExtension.config.get().embraceConfig?.apiToken.orEmpty(),
8585
endpoint = EmbraceEndpoint.PROGUARD,
8686
fileName = FILE_NAME_MAPPING_TXT,
87-
buildId = variantExtension.buildId.get(),
87+
buildId = variantExtension.config.get().buildId,
8888
baseUrl = baseUrl,
8989
)
9090
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class EmbraceRnSourcemapGeneratorTaskRegistration : EmbraceTaskRegistration {
9090
rnTask.requestParams.set(
9191
project.provider {
9292
RequestParams(
93-
appId = variantExtension.appId.get(),
94-
apiToken = variantExtension.apiToken.get(),
93+
appId = variantExtension.config.orNull?.embraceConfig?.appId.orEmpty(),
94+
apiToken = variantExtension.config.orNull?.embraceConfig?.apiToken.orEmpty(),
9595
endpoint = EmbraceEndpoint.SOURCE_MAP,
9696
fileName = FILE_NAME_SOURCE_MAP_JSON,
9797
baseUrl = baseUrl,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class TaskRegistrar(
8686
false
8787
} else {
8888
val variantExtension = embraceExtensionInternal.variants.getByName(variant.name)
89-
if (variantExtension.apiToken.orNull.isNullOrEmpty()) {
89+
if (variantExtension.config.orNull?.embraceConfig?.apiToken.isNullOrEmpty()) {
9090
false
91-
} else if (variantExtension.appId.orNull.isNullOrEmpty()) {
91+
} else if (variantExtension.config.orNull?.embraceConfig?.appId.isNullOrEmpty()) {
9292
false
9393
} else {
9494
true

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import io.embrace.android.gradle.plugin.config.UnitySymbolsDir
66
import io.embrace.android.gradle.plugin.extension.EXTENSION_EMBRACE_INTERNAL
77
import io.embrace.android.gradle.plugin.extension.EmbraceExtensionInternal
88
import io.embrace.android.gradle.plugin.gradle.isTaskRegistered
9+
import io.embrace.android.gradle.plugin.instrumentation.config.model.EmbraceVariantConfig
10+
import io.embrace.android.gradle.plugin.instrumentation.config.model.VariantConfig
911
import io.embrace.android.gradle.plugin.model.AndroidCompactedVariantData
1012
import io.embrace.android.gradle.plugin.network.EmbraceEndpoint
1113
import io.embrace.android.gradle.plugin.tasks.common.RequestParams
@@ -56,9 +58,17 @@ class NdkUploadTaskRegistrationTest {
5658
)
5759

5860
extension.variants.create("variantName").also { newVariant ->
59-
newVariant.appId.set("appId")
60-
newVariant.apiToken.set("apiToken")
61-
newVariant.ndkEnabled.set(ndkEnabled)
61+
newVariant.config.set(
62+
VariantConfig(
63+
embraceConfig = EmbraceVariantConfig(
64+
appId = "appId",
65+
apiToken = "apiToken",
66+
ndkEnabled = ndkEnabled,
67+
sdkConfig = null,
68+
unityConfig = null
69+
)
70+
)
71+
)
6272
newVariant.projectType.set(projectType)
6373
newVariant.unitySymbolsDir.set(unitySymbolsDir)
6474
}

0 commit comments

Comments
 (0)