From c709738d7f16bc613510789b99cbe202cd021a00 Mon Sep 17 00:00:00 2001
From: Vadzim Hushchanskou <vadzim_hushchanskou@epam.com>
Date: Thu, 14 Mar 2024 16:47:10 +0300
Subject: [PATCH] Dependency refactoring
---
CHANGELOG.md | 2 --
agent-android-junit5/build.gradle | 12 +++---------
agent-android-junit5/gradle.properties | 2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 127ad30..3b721fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,6 @@
# Changelog
## [Unreleased]
-
-## [5.2.1]
### 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
diff --git a/agent-android-junit5/build.gradle b/agent-android-junit5/build.gradle
index ba84240..6f45e65 100644
--- a/agent-android-junit5/build.gradle
+++ b/agent-android-junit5/build.gradle
@@ -66,10 +66,6 @@ configurations {
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
task internalizeJar(type: ShadowJar) {
- dependencies {
- include(dependency('com.epam.reportportal:agent-java-junit5'))
- }
-
archiveClassifier.set('intern')
archiveVersion.set('')
exclude 'agent.properties'
@@ -84,9 +80,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// Android Espresso libraries
- api "androidx.test:runner:1.5.2"
- implementation 'androidx.test.ext:junit:1.1.5'
- implementation 'androidx.test.espresso:espresso-core:3.5.1'
+ compileOnly "androidx.test:runner:1.5.2"
// Report Portal libraries
internalize(group: 'com.epam.reportportal', name: 'agent-java-junit5', version: '5.3.0', transitive: false)
@@ -102,8 +96,8 @@ dependencies {
compileOnly "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
// android-junit5 necessary libraries
- implementation "de.mannodermaus.junit5:android-test-core:${android_junit5_version}"
- implementation "de.mannodermaus.junit5:android-test-runner:${android_junit5_version}"
+ compileOnly "de.mannodermaus.junit5:android-test-core:${android_junit5_version}"
+ compileOnly "de.mannodermaus.junit5:android-test-runner:${android_junit5_version}"
}
project.afterEvaluate {
diff --git a/agent-android-junit5/gradle.properties b/agent-android-junit5/gradle.properties
index 74c5f4a..6fc7d5c 100644
--- a/agent-android-junit5/gradle.properties
+++ b/agent-android-junit5/gradle.properties
@@ -1 +1 @@
-version=5.2.2-SNAPSHOT
+version=5.2.1-SNAPSHOT