From 5f919762cfd88495bbc41800d0ff042479c18327 Mon Sep 17 00:00:00 2001 From: Ruben Sousa Date: Mon, 11 Nov 2024 01:20:45 +0100 Subject: [PATCH] Update carioca reports to latest version --- .github/workflows/pr.yml | 2 +- dpadrecyclerview-compose/build.gradle | 10 +++++++--- dpadrecyclerview-testing/build.gradle | 10 +++++++--- dpadrecyclerview/build.gradle | 10 +++++++--- gradle/libs.versions.toml | 4 ++-- settings.gradle | 3 +++ 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8b27d080..5844ca97 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -129,7 +129,7 @@ jobs: name: ${{ matrix.api-level }}-${{ matrix.arch }}-instrumentation-test-results path: | logs/** + build/outputs/ ./**/build/reports/androidTests/connected/** - ./**/build/outputs/allure-results ./**/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/** if: always() \ No newline at end of file diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle index 9e9cf420..945503f9 100644 --- a/dpadrecyclerview-compose/build.gradle +++ b/dpadrecyclerview-compose/build.gradle @@ -33,12 +33,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } @@ -62,3 +62,7 @@ dependencies { androidTestImplementation libs.androidx.test.compose.ui.junit4 androidTestUtil libs.androidx.test.services } + +allureReport { + outputDir = rootProject.file("build/outputs/allure-results") +} \ No newline at end of file diff --git a/dpadrecyclerview-testing/build.gradle b/dpadrecyclerview-testing/build.gradle index 8d041b21..43617690 100644 --- a/dpadrecyclerview-testing/build.gradle +++ b/dpadrecyclerview-testing/build.gradle @@ -32,12 +32,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } testOptions { @@ -63,3 +63,7 @@ dependencies { androidTestImplementation project (':dpadrecyclerview-test-fixtures') androidTestUtil libs.androidx.test.services } + +allureReport { + outputDir = rootProject.file("build/outputs/allure-results") +} \ No newline at end of file diff --git a/dpadrecyclerview/build.gradle b/dpadrecyclerview/build.gradle index c4c8e79d..dbb554bd 100644 --- a/dpadrecyclerview/build.gradle +++ b/dpadrecyclerview/build.gradle @@ -38,11 +38,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } @@ -65,3 +65,7 @@ dependencies { androidTestImplementation project (':dpadrecyclerview-test-fixtures') androidTestUtil libs.androidx.test.services } + +allureReport { + outputDir = rootProject.file("build/outputs/allure-results") +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a734ae2..99ff8b5e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,8 +34,8 @@ jacoco = "0.8.11" test-junit = '4.13.2' test-truth = '1.4.1' test-mockk = '1.13.10' -carioca-report = "1.0.0-alpha01" -carioca-allure = "1.0.0-alpha01" +carioca-report = "1.0.0-beta01" +carioca-allure = "1.0.0-beta01" [plugins] android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } diff --git a/settings.gradle b/settings.gradle index 6f809e9a..298faa69 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,9 @@ pluginManagement { gradlePluginPortal() google() mavenCentral() + maven { + url "https://s01.oss.sonatype.org/content/repositories/releases/" + } } } dependencyResolutionManagement {