Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #31

Merged
merged 4 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Build with Gradle
run: ./gradlew build
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

## [Unreleased]
### Changed
- JUnit 5 agent version updated on [5.3.5](https://github.com/reportportal/agent-java-junit5/releases/tag/5.3.5), by @HardNorth
- Client version updated on [5.2.26](https://github.com/reportportal/client-java/releases/tag/5.2.26), by @HardNorth

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

buildscript {
ext {
agp_version = '8.2.2'
agp_version = '8.3.2'
kotlin_version = '1.9.10'
}
repositories {
google()
mavenCentral()
jcenter()
gradlePluginPortal()
}
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$kotlin_version"
classpath 'net.researchgate:gradle-release:2.8.1'
classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
classpath 'com.github.johnrengelman:shadow:8.1.1'
}
}

allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ description=Android Espresso JUnit5 integration for ReportPortal
android.enableJetifier=true
android.useAndroidX=true
android_junit5_version=1.4.0
junit5_version=5.10.0
junit5_version=5.10.1
scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts
scripts_branch=master
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jan 31 13:02:37 MSK 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading