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 #7

Merged
merged 1 commit into from
Feb 21, 2024
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
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '8'

- name: Build with Gradle
run: ./gradlew build

- name: Codecov upload
run: bash <(curl -s https://codecov.io/bash)
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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
Expand All @@ -48,7 +48,7 @@ jobs:
version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }}

- name: Set up JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '8'
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
body: ${{ steps.readChangelogEntry.outputs.changes }}

- name: Checkout develop branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'
fetch-depth: 0
Expand Down
43 changes: 0 additions & 43 deletions build-quality.gradle

This file was deleted.

22 changes: 6 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
apply plugin: 'java-library'

apply from: "build-quality.gradle"
apply from: "${project.scripts_url}/${project.scripts_branch}/release-commons.gradle"
apply from: "${project.scripts_url}/${project.scripts_branch}/signing.gradle"

Expand All @@ -31,23 +30,14 @@ java {
compileTestJava.options.encoding = "UTF-8"

dependencies {
api 'io.reactivex.rxjava2:rxjava:2.2.10'
api 'com.google.code.findbugs:jsr305:3.0.2'
api 'org.apache.commons:commons-lang3:3.11'
implementation 'org.apache.commons:commons-io:1.3.2'
implementation('org.awaitility:awaitility:4.0.2') {
compileOnly 'io.reactivex.rxjava2:rxjava:2.2.10'
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'org.apache.commons:commons-lang3:3.11'
compileOnly 'org.apache.commons:commons-io:1.3.2'
compileOnly('org.awaitility:awaitility:4.0.2') {
exclude group: 'org.hamcrest'
}
implementation 'org.hamcrest:hamcrest-core:2.2'
}

test {
useJUnitPlatform()
systemProperty("file.encoding", "utf-8")
testLogging {
exceptionFormat = 'full'
}
exclude('com/github/reportportal/common/util/test/feature/**')
compileOnly 'org.hamcrest:hamcrest-core:2.2'
}

release {
Expand Down