Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version 1.7.15
--------------

-
- Allow users to provide a custom `manifestPath` in the Sentry Gradle Plugin.

Version 1.7.14
--------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,21 +146,23 @@ class SentryPlugin implements Plugin<Project> {

project.android.applicationVariants.all { ApplicationVariant variant ->
variant.outputs.each { variantOutput ->
def manifestPath
try {
// Android Gradle Plugin < 3.0.0
manifestPath = variantOutput.processManifest.manifestOutputFile
} catch (Exception ignored) {
// Android Gradle Plugin >= 3.0.0
manifestPath = new File(
variantOutput.processManifest.manifestOutputDirectory.toString(),
"AndroidManifest.xml")
if (!manifestPath.isFile()) {
def manifestPath = extension.manifestPath
if (manifestPath == null) {
try {
// Android Gradle Plugin < 3.0.0
manifestPath = variantOutput.processManifest.manifestOutputFile
} catch (Exception ignored) {
// Android Gradle Plugin >= 3.0.0
manifestPath = new File(
new File(
variantOutput.processManifest.manifestOutputDirectory.toString(),
variantOutput.dirName),
variantOutput.processManifest.manifestOutputDirectory.toString(),
"AndroidManifest.xml")
if (!manifestPath.isFile()) {
manifestPath = new File(
new File(
variantOutput.processManifest.manifestOutputDirectory.toString(),
variantOutput.dirName),
"AndroidManifest.xml")
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ package io.sentry.android.gradle
class SentryPluginExtension {
def boolean autoProguardConfig = true;
def boolean autoUpload = true;
def String manifestPath = null;
}