Skip to content

Map projectType correctly in getShouldExecuteCompressionTaskProvider #2134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priettt merged 1 commit into from
Apr 28, 2025
Merged

Map projectType correctly in getShouldExecuteCompressionTaskProvider #2134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...in/src/main/java/io/embrace/android/gradle/plugin/tasks/ndk/NdkUploadTasksRegistration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class NdkUploadTasksRegistration(
}

compressionTaskProvider.configure { compressionTask: CompressSharedObjectFilesTask ->
val shouldExecuteCompressionTaskProvider = getShouldExecuteCompressionTaskProvider(project)
val shouldExecuteCompressionTaskProvider = getShouldExecuteCompressionTaskProvider()
compressionTask.onlyIf { shouldExecuteCompressionTaskProvider.orNull ?: true }
// TODO: check if these are only needed for Unity and comment accordingly.
compressionTask.mustRunAfter(object : Callable<Any> {
Expand Down Expand Up @@ -102,12 +102,12 @@ class NdkUploadTasksRegistration(
// TODO: An error thrown in registration will make the build will fail. Should we use failBuildOnUploadErrors for this too?
task.failBuildOnUploadErrors.set(behavior.failBuildOnUploadErrors)
task.requestParams.set(
project.provider {
behavior.failBuildOnUploadErrors.map { failBuildOnUploadErrors ->
RequestParams(
appId = variantConfig.embraceConfig?.appId.orEmpty(),
apiToken = variantConfig.embraceConfig?.apiToken.orEmpty(),
endpoint = EmbraceEndpoint.NDK,
failBuildOnUploadErrors = behavior.failBuildOnUploadErrors.get(),
failBuildOnUploadErrors = failBuildOnUploadErrors,
baseUrl = behavior.baseUrl,
)
}
Expand Down Expand Up @@ -221,7 +221,7 @@ class NdkUploadTasksRegistration(
"${variantData.flavorName}/${variantData.buildTypeName}"
}

private fun getShouldExecuteCompressionTaskProvider(project: Project) = project.provider {
(projectType.orNull == ProjectType.NATIVE || projectType.orNull == ProjectType.UNITY)
private fun getShouldExecuteCompressionTaskProvider() = projectType.map {
(it == ProjectType.NATIVE || it == ProjectType.UNITY)
}
}
Loading