Release

.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'

.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

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- 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

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)
 

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)
 

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'
+    }
 }
 
 
@@ -59,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'))
@@ -83,20 +89,21 @@ dependencies {
     implementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // Report Portal libraries
-    internalize 'com.epam.reportportal:agent-java-junit5:5.2.0'
+    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.2'
-    api 'com.google.code.findbugs:jsr305:3.0.2'
-    api 'com.epam.reportportal:commons-model:5.0.0'
+    // 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
-    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 {

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