diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffae5c4..e38c84f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e70454d..0b26222 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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' @@ -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 diff --git a/build-quality.gradle b/build-quality.gradle deleted file mode 100644 index d3c4c51..0000000 --- a/build-quality.gradle +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -buildscript { - repositories { - maven { - url 'https://plugins.gradle.org/m2/' - } - } - dependencies { - classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:4.8.0' - } -} - -apply plugin: com.github.spotbugs.snom.SpotBugsPlugin - -spotbugs { - toolVersion = '3.1.12' - effort = 'max' - reportLevel = 'high' -} - -spotbugsMain { - sourceDirs = files(sourceSets.main.allSource.srcDirs) - classDirs = files(sourceSets.main.output) - auxClassPaths = files(sourceSets.main.compileClasspath) - reports { - html.enabled(true) - xml.enabled(false) - } -} diff --git a/build.gradle b/build.gradle index 5c23db1..ee8c115 100644 --- a/build.gradle +++ b/build.gradle @@ -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" @@ -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 {