diff --git a/firebase-crashlytics-gradle/CHANGELOG.md b/firebase-crashlytics-gradle/CHANGELOG.md index 788d38a1e0c..019322e7065 100644 --- a/firebase-crashlytics-gradle/CHANGELOG.md +++ b/firebase-crashlytics-gradle/CHANGELOG.md @@ -1,7 +1,11 @@ ### Unreleased -- [changed] Improved efficiency when extracting breakpad binary files. -- [fixed] Avoid build breaks when handling unsupported native libraries for injectCrashlyticsBuildIds task [#7780] +- [fixed] Fixed an incompatibility between Crashlytics Gradle plugin and Gradle isolated projects when enabling nativeSymbolUploadEnabled. [#8037] + +### Crashlytics Gradle plugin version 3.0.7 + +* [changed] Improved efficiency when extracting breakpad binary files. +* [fixed] Avoid build breaks when handling unsupported native libraries for injectCrashlyticsBuildIds task [#7780] ### Crashlytics Gradle plugin version 3.0.6 diff --git a/firebase-crashlytics-gradle/src/main/kotlin/com/google/firebase/crashlytics/buildtools/gradle/tasks/GenerateSymbolFileTask.kt b/firebase-crashlytics-gradle/src/main/kotlin/com/google/firebase/crashlytics/buildtools/gradle/tasks/GenerateSymbolFileTask.kt index a18e7ad4df3..7472735b16b 100644 --- a/firebase-crashlytics-gradle/src/main/kotlin/com/google/firebase/crashlytics/buildtools/gradle/tasks/GenerateSymbolFileTask.kt +++ b/firebase-crashlytics-gradle/src/main/kotlin/com/google/firebase/crashlytics/buildtools/gradle/tasks/GenerateSymbolFileTask.kt @@ -135,13 +135,9 @@ abstract class GenerateSymbolFileTask : DefaultTask() { symbolGeneratorTypeOverride: Property, ) { val symbolGeneratorTypeString = - if (project.hasProperty(SYMBOL_GENERATOR_PROPERTY)) { - project.findProperty(SYMBOL_GENERATOR_PROPERTY) as String - } else if (symbolGeneratorTypeOverride.isPresent) { - symbolGeneratorTypeOverride.get() - } else { - SYMBOL_GENERATOR_BREAKPAD - } + project.providers.gradleProperty(SYMBOL_GENERATOR_PROPERTY) + .orElse(symbolGeneratorTypeOverride) + .getOrElse(SYMBOL_GENERATOR_BREAKPAD) // This will also validate the symbol generator type string. symbolGeneratorType.set(SymbolGeneratorType.fromString(symbolGeneratorTypeString)) @@ -174,8 +170,10 @@ abstract class GenerateSymbolFileTask : DefaultTask() { project.tasks.register( "generateCrashlyticsSymbolFile${variant.name.capitalized()}" ) { - if (project.hasProperty(BREAKPAD_BINARY_PROPERTY)) { - breakpadBinary.set(File(project.findProperty(BREAKPAD_BINARY_PROPERTY) as String)) + val breakpadBinaryGradleProperty = + project.providers.gradleProperty(BREAKPAD_BINARY_PROPERTY) + if (breakpadBinaryGradleProperty.isPresent) { + breakpadBinary.set(File(breakpadBinaryGradleProperty.get())) } else { breakpadBinary.set(crashlyticsExtension.breakpadBinary) }