Skip to content

Commit 3530459

Browse files
authored
Merge pull request #86 from rubensousa/logcat_fix
Fix logcat not being attached
2 parents 47134f9 + 7b56c97 commit 3530459

File tree

8 files changed

+13
-6
lines changed

8 files changed

+13
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*.iml
22
.gradle
3-
/.kotlin
3+
*/.kotlin
44
/local.properties
55
/.idea
66
.DS_Store

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ subprojects {
4141
plugins.withId("com.rubensousa.carioca.report.allure") {
4242
extensions.getByType(AllureReportExtension::class).apply {
4343
outputDir = rootProject.file("build/outputs/allure-results")
44+
attachLogcatOnSuccess = true
4445
}
4546
}
4647

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
POM_NAME=Carioca Android Allure Report Plugin
2-
VERSION_NAME=1.0.1
2+
VERSION_NAME=1.0.2
33
POM_ARTIFACT_ID=report-android-allure-gradle-plugin
44
POM_DESCRIPTION=Plugin that generates instrumented test reports for allure
55
POM_PACKAGING=jar

carioca-report-allure-gradle-plugin/src/main/kotlin/com/rubensousa/carioca/report/android/allure/gradle/AllureReportPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class AllureReportPlugin : Plugin<Project> {
207207
private fun getLogcatOutputDir(project: Project, variant: Variant): File {
208208
val flavorName = variant.flavorName
209209
val buildType = variant.buildType ?: "debug"
210-
val path = if (flavorName == null) {
210+
val path = if (flavorName.isNullOrBlank()) {
211211
"$logcatOutputDirPath/$buildType"
212212
} else {
213213
"$logcatOutputDirPath/$buildType/flavors/$flavorName"

docs/changelog/android-allure.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Plugin id: `com.rubensousa.carioca.report.allure`
44

5+
## Version 1.0.2
6+
7+
2026-02-24
8+
9+
- Fixed logcat not being attached to reports [#86](https://github.com/rubensousa/Carioca/pull/86)
10+
511
## Version 1.0.1
612

713
2025-05-08

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
activityCompose = "1.9.2"
3-
agp = "8.9.2"
3+
agp = "8.13.2"
44
android-tools = "31.6.0"
55
hiltNavigationCompose = "1.2.0"
66
kotlin = "2.0.20"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu May 08 17:54:36 CEST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extra:
2626
version:
2727
report: '1.0.1'
2828
junit4: '1.0.0'
29-
allure_plugin: '1.0.1'
29+
allure_plugin: '1.0.2'
3030
hilt: '1.0.0'
3131
social:
3232
- icon: 'fontawesome/brands/github'

0 commit comments

Comments
 (0)