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.

Sign up for GitHub

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

Bumping junit5 version #449

Merged
merged 3 commits into from
Apr 2, 2025
Merged

Bumping junit5 version #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9067230
Bumping junit5 version
LikeTheSalad Apr 2, 2025
4b5b076
Updating labeler
LikeTheSalad Apr 2, 2025
4e7d886
Updating labeler
LikeTheSalad Apr 2, 2025
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
14 changes: 8 additions & 6 deletions .github/workflows/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ jobs:
configuration-path: .github/community-label.yml
enable-versioned-regex: 0
- name: Assign new internal pull requests to project
uses: elastic/assign-one-project-github-action@1.2.2
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event.pull_request
with:
project: 'https://github.com/orgs/elastic/projects/454'
project_id: '5882982'
column_name: 'In Progress'
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request'
run: |
item_id=$(gh project item-add 1674 --url https://github.com/elastic/apm-agent-android/pull/$PR_NUMBER --owner elastic --format json --jq .id)
gh project item-edit --id "$item_id" --project-id "$PROJECT_ID" --field-id "$FIELD_ID" --single-select-option-id "$OPTION_ID"
env:
MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
PROJECT_ID: 'PVT_kwDOAGc3Zs4Am42e'
FIELD_ID: 'PVTSSF_lADOAGc3Zs4Am42ezgetx6g'
OPTION_ID: 'f37476bf'
PR_NUMBER: ${{ github.event.pull_request.number }}
1 change: 1 addition & 0 deletions build-tools/src/main/kotlin/elastic.android-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies {
implementation(project(":agent-common"))
testImplementation(libs.findBundle("mocking").get())
testImplementation(platform(libs.findLibrary("junit-bom").get()))
testImplementation(libs.findBundle("junit").get())
testImplementation(libs.findLibrary("assertj").get())
testImplementation(project(":internal-tools:test-common"))
Expand Down
1 change: 1 addition & 0 deletions build-tools/src/main/kotlin/elastic.java-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ tasks.withType(Javadoc::class).configureEach {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies {
testImplementation(libs.findBundle("mocking").get())
testImplementation(platform(libs.findLibrary("junit-bom").get()))
testImplementation(libs.findBundle("junit").get())
testImplementation(libs.findLibrary("assertj").get())
testRuntimeOnly(libs.findLibrary("junit5-vintage").get())
Expand Down
10 changes: 6 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ opentelemetry-contrib = "1.43.0-alpha"
byteBuddy = "1.17.5"
kotlin = "2.1.20"
android = "8.9.1"
junit5 = "5.11.4"
autoService = "1.1.1"

[libraries]
Expand All @@ -22,8 +21,11 @@ opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporte

#Test tools
junit4 = "junit:junit:4.13.2"
junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
junit5-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
junit-bom = "org.junit:junit-bom:5.12.1"
junit5-vintage = { module = "org.junit.vintage:junit-vintage-engine" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
opentelemetry-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
robolectric = "org.robolectric:robolectric:4.14.1"
assertj = "org.assertj:assertj-core:3.27.3"
Expand Down Expand Up @@ -52,7 +54,7 @@ mavenModel = "org.apache.maven:maven-model:3.9.9"

[bundles]
mocking = ["mockk"]
junit = ["junit4", "junit5"]
junit = ["junit4", "junit-jupiter", "junit-launcher", "junit-engine", "junit5-vintage", ]
opentelemetry-semconv = ["opentelemetry-semconv", "opentelemetry-semconv-incubating"]

[plugins]
Expand Down