Skip to content

Commit

Permalink
Merge pull request #30 from reportportal/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
HardNorth authored Apr 5, 2024
2 parents 68380b7 + 2f34454 commit b2081ab
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 33 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## [Unreleased]
### Changed
- Client version updated on [5.2.13](https://github.com/reportportal/client-java/releases/tag/5.2.13), by @HardNorth

## [5.2.2]
### Changed
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ available versions instead of copy-pasting them from here.
```
* Add Android-JUnit5 dependencies:
```groovy
implementation 'androidx.test:runner:1.3.0'
implementation 'de.mannodermaus.junit5:android-test-core:1.3.0'
implementation 'de.mannodermaus.junit5:android-test-runner:1.3.0'
implementation 'androidx.test:runner:1.5.2'
implementation 'de.mannodermaus.junit5:android-test-core:1.4.0'
implementation 'de.mannodermaus.junit5:android-test-runner:1.4.0'
```
* Add JUnit 5 dependencies:
```groovy
implementation "org.junit.platform:junit-platform-runner:1.9.1"
implementation "org.junit.jupiter:junit-jupiter-engine:5.9.1"
implementation "org.junit.platform:junit-platform-runner:1.9.3"
implementation "org.junit.jupiter:junit-jupiter-engine:5.9.3"
// JUnit5 (Optional) If you need "Parameterized Tests"
implementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
implementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
```

Here is a full example of `build.gradle` file for Kotlin-based project (remember update library versions):
Expand Down Expand Up @@ -168,12 +168,10 @@ dependencies {
implementation ('com.epam.reportportal:agent-android-junit5:5.2.2') {
exclude group: 'org.aspectj' // AspectJ usually already included by Android
}
implementation ('com.epam.reportportal:logger-java-logback:5.1.4') {
exclude group: 'com.epam.reportportal'
}
implementation 'com.epam.reportportal:logger-java-logback:5.2.2'
// Logging support, newer versions of logback do not support Android
implementation 'ch.qos.logback:logback-classic:1.2.11'
implementation 'ch.qos.logback:logback-classic:1.3.12'
// android-junit5 necessary libraries
implementation 'androidx.test:runner:1.5.2'
Expand Down Expand Up @@ -257,9 +255,7 @@ test phase only.
Put this dependency into `dependencies` section of your `build.gradle` file of integration test
module:
```groovy
implementation ('com.epam.reportportal:logger-java-logback:5.1.4') {
exclude group: 'com.epam.reportportal' // Already included by the agent dependency
}
implementation 'com.epam.reportportal:logger-java-logback:5.2.2'
```

#### 'logback.xml' file
Expand Down
32 changes: 14 additions & 18 deletions README_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ available versions instead of copy-pasting them from here.
```
* Add Android-JUnit5 dependencies:
```groovy
implementation 'androidx.test:runner:1.3.0'
implementation 'de.mannodermaus.junit5:android-test-core:1.3.0'
implementation 'de.mannodermaus.junit5:android-test-runner:1.3.0'
implementation 'androidx.test:runner:1.5.2'
implementation 'de.mannodermaus.junit5:android-test-core:1.4.0'
implementation 'de.mannodermaus.junit5:android-test-runner:1.4.0'
```
* Add JUnit 5 dependencies:
```groovy
implementation "org.junit.platform:junit-platform-runner:1.9.1"
implementation "org.junit.jupiter:junit-jupiter-engine:5.9.1"
implementation "org.junit.platform:junit-platform-runner:1.10.0"
implementation "org.junit.jupiter:junit-jupiter-engine:5.10.0"
// JUnit5 (Optional) If you need "Parameterized Tests"
implementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
implementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
```

Here is a full example of `build.gradle` file for Kotlin-based project (remember update library versions):
Expand Down Expand Up @@ -168,24 +168,22 @@ dependencies {
implementation ('com.epam.reportportal:agent-android-junit5:$LATEST_VERSION') {
exclude group: 'org.aspectj' // AspectJ usually already included by Android
}
implementation ('com.epam.reportportal:logger-java-logback:5.1.4') {
exclude group: 'com.epam.reportportal'
}
implementation 'com.epam.reportportal:logger-java-logback:5.2.2'
// Logging support, newer versions of logback do not support Android
implementation 'ch.qos.logback:logback-classic:1.2.11'
implementation 'ch.qos.logback:logback-classic:1.3.12'
// android-junit5 necessary libraries
implementation 'androidx.test:runner:1.5.2'
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:1.4.0'
implementation 'de.mannodermaus.junit5:android-test-runner:1.4.0'
// JUnit5 libraries, 'junit-jupiter-api' is inherited from agent
implementation "org.junit.platform:junit-platform-runner:1.9.1"
implementation "org.junit.jupiter:junit-jupiter-engine:5.9.1"
implementation "org.junit.platform:junit-platform-runner:1.10.0"
implementation "org.junit.jupiter:junit-jupiter-engine:5.10.0"
// JUnit5 (Optional) If you need "Parameterized Tests"
implementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
implementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
}
```
### Create `reportportal.properties` configuration file
Expand Down Expand Up @@ -257,9 +255,7 @@ test phase only.
Put this dependency into `dependencies` section of your `build.gradle` file of integration test
module:
```groovy
implementation ('com.epam.reportportal:logger-java-logback:5.1.4') {
exclude group: 'com.epam.reportportal' // Already included by the agent dependency
}
implementation 'com.epam.reportportal:logger-java-logback:5.2.2'
```

#### 'logback.xml' file
Expand Down
4 changes: 2 additions & 2 deletions agent-android-junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ dependencies {
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)
internalize(group: 'com.epam.reportportal', name: 'agent-java-junit5', version: '5.3.1', transitive: false)
api tasks.internalizeJar.outputs.files
// Next three dependencies are required due to internalization
api('com.epam.reportportal:client-java:5.2.7') {
api('com.epam.reportportal:client-java:5.2.13') {
exclude group: 'org.aspectj' // AspectJ is already included by Android
}
implementation 'com.google.code.findbugs:jsr305:3.0.2'
Expand Down

0 comments on commit b2081ab

Please sign in to comment.