From b11a68d84bddd11623b23569c64e6b646d23c93e Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel <13565058+raikbitters@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:37:28 +0400 Subject: [PATCH 1/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1242062..e8e99be 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-android-junit5.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-android-junit5%22) [![CI Build](https://github.com/reportportal/agent-android/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-android/actions/workflows/ci.yml) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) From 71cbc6f7db7775526090e14c178f748dce862bc2 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 21 Feb 2024 16:09:34 +0300 Subject: [PATCH 2/8] Actions versions update --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29a6bf5..fdd2f23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,10 +28,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 029828b..af26b9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -51,7 +51,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -109,7 +109,7 @@ jobs: - name: Checkout develop branch if: ${{ github.ref }} == ${{ env.RELEASE_BRANCH }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.DEVELOP_BRANCH }} fetch-depth: 0 From 9ff972d1e088f72bb59fc1720d3624b07cccee13 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 21 Feb 2024 16:37:18 +0300 Subject: [PATCH 3/8] Dependencies versions update --- CHANGELOG.md | 3 +++ agent-android-junit5/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f35d9d..0477e48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### Changed +- JUnit 5 agent version updated on [5.2.1](https://github.com/reportportal/agent-java-junit5/releases/tag/5.2.1), by @HardNorth +- Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth ## [5.2.0] ### Removed diff --git a/agent-android-junit5/build.gradle b/agent-android-junit5/build.gradle index 31e7881..1e5e40f 100644 --- a/agent-android-junit5/build.gradle +++ b/agent-android-junit5/build.gradle @@ -83,9 +83,9 @@ dependencies { implementation 'androidx.test.espresso:espresso-core:3.5.1' // Report Portal libraries - internalize 'com.epam.reportportal:agent-java-junit5:5.2.0' + internalize 'com.epam.reportportal:agent-java-junit5:5.2.1' api tasks.internalizeJar.outputs.files - api 'com.epam.reportportal:client-java:5.2.2' + api 'com.epam.reportportal:client-java:5.2.5' api 'com.google.code.findbugs:jsr305:3.0.2' api 'com.epam.reportportal:commons-model:5.0.0' From 30e9cbde1d61a46440e43a9f438dc80009015a50 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 15:56:09 +0300 Subject: [PATCH 4/8] Dependencies versions update --- README_TEMPLATE.md | 2 +- agent-android-junit5/build.gradle | 24 +++++++++++++++--------- gradle.properties | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index a160a03..431a6fa 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -6,7 +6,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-android-junit5.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-android-junit5%22) [![CI Build](https://github.com/reportportal/agent-android/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-android/actions/workflows/ci.yml) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) diff --git a/agent-android-junit5/build.gradle b/agent-android-junit5/build.gradle index 1e5e40f..0c59811 100644 --- a/agent-android-junit5/build.gradle +++ b/agent-android-junit5/build.gradle @@ -51,6 +51,11 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_17 } + + packagingOptions { + exclude 'META-INF/LICENSE*' + exclude 'META-INF/INDEX.LIST' + } } @@ -83,20 +88,21 @@ dependencies { implementation 'androidx.test.espresso:espresso-core:3.5.1' // Report Portal libraries - internalize 'com.epam.reportportal:agent-java-junit5:5.2.1' + internalize ('com.epam.reportportal:agent-java-junit5:5.3.0') { + exclude group: 'org.aspectj' // AspectJ is already included by Android + } api tasks.internalizeJar.outputs.files - api 'com.epam.reportportal:client-java:5.2.5' - api 'com.google.code.findbugs:jsr305:3.0.2' - api 'com.epam.reportportal:commons-model:5.0.0' + api ('com.epam.reportportal:client-java:5.2.5') { + exclude group: 'org.aspectj' // AspectJ is already included by Android + } + implementation 'com.google.code.findbugs:jsr305:3.0.2' // JUnit 5 - api "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}" - implementation "org.junit.platform:junit-platform-runner:${project.junit5RunnerVersion}" - implementation "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}" + compileOnly "org.junit.jupiter:junit-jupiter-api:${junit5_version}" // android-junit5 necessary libraries - implementation 'de.mannodermaus.junit5:android-test-core:1.3.0' - implementation 'de.mannodermaus.junit5:android-test-runner:1.3.0' + implementation "de.mannodermaus.junit5:android-test-core:${android_junit5_version}" + implementation "de.mannodermaus.junit5:android-test-runner:${android_junit5_version}" } project.afterEvaluate { diff --git a/gradle.properties b/gradle.properties index c15893d..8fef4b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ group=com.epam.reportportal description=Android Espresso JUnit5 integration for ReportPortal android.enableJetifier=true android.useAndroidX=true -junit5RunnerVersion=1.9.1 -junit5Version=5.9.1 +android_junit5_version=1.4.0 +junit5_version=5.10.0 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master From e61d439113049d8ba9112fbf4ba131b0314c9d59 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 15:57:32 +0300 Subject: [PATCH 5/8] CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0477e48..2df5120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Changed - JUnit 5 agent version updated on [5.2.1](https://github.com/reportportal/agent-java-junit5/releases/tag/5.2.1), by @HardNorth +- `Android-JUnit5` version updated on `1.4.0`, by @HardNorth - Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth ## [5.2.0] From acff095fca7b7f0ff2c88625d4daa10d85284ee7 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 15:57:56 +0300 Subject: [PATCH 6/8] CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2df5120..f2c9bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [Unreleased] ### Changed -- JUnit 5 agent version updated on [5.2.1](https://github.com/reportportal/agent-java-junit5/releases/tag/5.2.1), by @HardNorth +- JUnit 5 agent version updated on [5.3.0](https://github.com/reportportal/agent-java-junit5/releases/tag/5.3.0), by @HardNorth - `Android-JUnit5` version updated on `1.4.0`, by @HardNorth - Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth From 3ad5e0b59a8a1c5745e3862b6078db6dc800383b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 16:23:09 +0300 Subject: [PATCH 7/8] Dependency refactoring --- CHANGELOG.md | 1 + agent-android-junit5/build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2c9bd8..3b721fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - JUnit 5 agent version updated on [5.3.0](https://github.com/reportportal/agent-java-junit5/releases/tag/5.3.0), by @HardNorth - `Android-JUnit5` version updated on `1.4.0`, by @HardNorth - Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth +- Dependency refactoring, by @HardNorth ## [5.2.0] ### Removed diff --git a/agent-android-junit5/build.gradle b/agent-android-junit5/build.gradle index 0c59811..5b79167 100644 --- a/agent-android-junit5/build.gradle +++ b/agent-android-junit5/build.gradle @@ -64,6 +64,7 @@ configurations { } import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + task internalizeJar(type: ShadowJar) { dependencies { include(dependency('com.epam.reportportal:agent-java-junit5')) @@ -88,11 +89,10 @@ dependencies { implementation 'androidx.test.espresso:espresso-core:3.5.1' // Report Portal libraries - internalize ('com.epam.reportportal:agent-java-junit5:5.3.0') { - exclude group: 'org.aspectj' // AspectJ is already included by Android - } + internalize(group: 'com.epam.reportportal', name: 'agent-java-junit5', version: '5.3.0', transitive: false) api tasks.internalizeJar.outputs.files - api ('com.epam.reportportal:client-java:5.2.5') { + // Next two dependencies are required due to internalization + api('com.epam.reportportal:client-java:5.2.6') { exclude group: 'org.aspectj' // AspectJ is already included by Android } implementation 'com.google.code.findbugs:jsr305:3.0.2' From 56dd26bb373d6fb7ea89952f50bfa6825b99bb4d Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 16:24:20 +0300 Subject: [PATCH 8/8] Dependency update --- agent-android-junit5/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent-android-junit5/build.gradle b/agent-android-junit5/build.gradle index 5b79167..ba84240 100644 --- a/agent-android-junit5/build.gradle +++ b/agent-android-junit5/build.gradle @@ -91,11 +91,12 @@ dependencies { // Report Portal libraries internalize(group: 'com.epam.reportportal', name: 'agent-java-junit5', version: '5.3.0', transitive: false) api tasks.internalizeJar.outputs.files - // Next two dependencies are required due to internalization + // Next three dependencies are required due to internalization api('com.epam.reportportal:client-java:5.2.6') { exclude group: 'org.aspectj' // AspectJ is already included by Android } implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'org.slf4j:slf4j-api:2.0.7' // JUnit 5 compileOnly "org.junit.jupiter:junit-jupiter-api:${junit5_version}"