Skip to content

Commit

Permalink
Fix gitlab pipeline, gradle build for java 8, and remove travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmfee-usgs committed Sep 17, 2022
1 parent 88841e1 commit 9845a4c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 66 deletions.
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ stages:
- ProductClient.jar
- ProductClient.zip
reports:
cobertura: build/reports/cobertura/cobertura.xml
coverage_report:
coverage_format: cobertura
path: build/reports/cobertura/cobertura.xml
junit: build/test-results/test/TEST-*.xml
cache:
paths:
Expand Down
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

24 changes: 2 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ plugins {
id "java"
id "jacoco" // code coverage
id "pmd" // static code analysis
id "org.ajoberstar.grgit" version "4.1.0" // git repo information
id "org.ajoberstar.git-publish" version "3.0.0" // publish gh-pages branch
id "org.ajoberstar.grgit" version "4.1.1" // git repo information
id "org.ajoberstar.git-publish" version "3.0.1" // publish gh-pages branch
id "com.kageiit.jacobo" version "2.1.0"
}

Expand All @@ -25,8 +25,6 @@ configurations {
}

dependencies {
codacy "com.codacy:codacy-coverage-reporter:4.0+"

// for explanation of dependency types, see
// https://docs.gradle.org/current/userguide/building_java_projects.html

Expand Down Expand Up @@ -189,9 +187,6 @@ gitPublish {
}
}


// Tasks for TravisCI

// convert jacoco to cobertura
import com.kageiit.jacobo.JacoboTask
tasks.create("jacobo", JacoboTask, {
Expand All @@ -200,18 +195,3 @@ tasks.create("jacobo", JacoboTask, {
it.srcDirs = sourceSets.main.java.srcDirs
}).dependsOn(jacocoTestReport)
check.dependsOn jacobo


// .travis.yml uses this to upload coverage
task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
description = "Upload coverage to codacy (used by TravisCI)"
main = "com.codacy.CodacyCoverageReporter"
classpath = configurations.codacy
args = [
"report",
"-l",
"Java",
"-r",
"${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
Expand Down

0 comments on commit 9845a4c

Please sign in to comment.