From 661f63eab76cf0594e240d113d1b6b3c80c5d74f Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Thu, 30 Nov 2017 11:33:05 +0100 Subject: [PATCH] Updated builds to include CodeCov --- .travis.yml | 13 +++++++++++-- README.adoc | 3 +++ build.gradle | 15 +++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54e990f3..8300ef05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,22 @@ language: java +dist: trusty +sudo: false + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -sudo: false -dist: trusty + jdk: - oraclejdk8 - openjdk8 - oraclejdk9 + +before_install: + - pip install --user codecov + +after_success: +- codecov diff --git a/README.adoc b/README.adoc index ec5c9aa2..e5b69842 100644 --- a/README.adoc +++ b/README.adoc @@ -4,8 +4,11 @@ Jeroen van Erp :sshj_version: 0.23.0 :source-highlighter: pygments +image:https://api.bintray.com/packages/hierynomus/maven/sshj/images/download.svg[link="https://bintray.com/hierynomus/maven/sshj/_latestVersion"] image:https://travis-ci.org/hierynomus/sshj.svg?branch=master[link="https://travis-ci.org/hierynomus/sshj"] image:https://api.codacy.com/project/badge/Grade/14a0a316bb9149739b5ea26dbfa8da8a["Codacy code quality", link="https://www.codacy.com/app/jeroen_2/sshj?utm_source=github.com&utm_medium=referral&utm_content=hierynomus/sshj&utm_campaign=Badge_Grade"] +image:https://codecov.io/gh/hierynomus/sshj/branch/master/graph/badge.svg["codecov", link="https://codecov.io/gh/hierynomus/sshj"] +image:http://www.javadoc.io/badge/com.hierynomus/sshj.svg?color=blue["JavaDocs", link="http://www.javadoc.io/doc/com.hierynomus/sshj"] image:https://maven-badges.herokuapp.com/maven-central/com.hierynomus/sshj/badge.svg["Maven Central",link="https://maven-badges.herokuapp.com/maven-central/com.hierynomus/sshj"] image:https://javadoc-emblem.rhcloud.com/doc/com.hierynomus/sshj/badge.svg["Javadoc",link="http://www.javadoc.io/doc/com.hierynomus/sshj"] diff --git a/build.gradle b/build.gradle index fbdb6534..86dcb72c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat plugins { id "java" id "groovy" + id "jacoco" id "osgi" id "maven-publish" id 'pl.allegro.tech.build.axion-release' version '1.8.1' @@ -30,7 +31,7 @@ targetCompatibility = 1.6 configurations.compile.transitive = false -def bouncycastleVersion = "1.56" +def bouncycastleVersion = "1.57" dependencies { signature 'org.codehaus.mojo.signature:java16:1.1@signature' @@ -111,7 +112,7 @@ jar { } } -sourcesJar{ +sourcesJar { manifest { attributes( // Add the needed OSGI attributes @@ -222,5 +223,15 @@ if (project.hasProperty("bintrayUsername") && project.hasProperty("bintrayApiKey } } +jacocoTestReport { + reports { + xml.enabled true + html.enabled true + } +} + + project.tasks.release.dependsOn(project.tasks.build) project.tasks.release.finalizedBy(project.tasks.bintrayUpload) +project.tasks.jacocoTestReport.dependsOn(project.tasks.test) +project.tasks.check.dependsOn(project.tasks.jacocoTestReport)