Skip to content

Commit

Permalink
Merge 29c037b into b8c1031
Browse files Browse the repository at this point in the history
  • Loading branch information
malafeev committed Jun 29, 2018
2 parents b8c1031 + 29c037b commit 21077ee
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -29,6 +29,9 @@ branches:
except:
- /^[0-9]/

after_success:
- mvn jacoco:report coveralls:report

env:
global:
# Ex. travis encrypt BINTRAY_USER=your_github_account
Expand Down
4 changes: 3 additions & 1 deletion README.md
@@ -1,4 +1,4 @@
[![Build Status][ci-img]][ci] [![Released Version][maven-img]][maven]
[![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov] [![Released Version][maven-img]][maven]

# OpenTracing instrumentation for `scala.concurrent`
OpenTracing instrumentation for `scala.concurrent` package.
Expand Down Expand Up @@ -97,5 +97,7 @@ Future {

[ci-img]: https://travis-ci.org/opentracing-contrib/scala-concurrent.svg?branch=master
[ci]: https://travis-ci.org/opentracing-contrib/scala-concurrent
[cov-img]: https://coveralls.io/repos/github/opentracing-contrib/scala-concurrent/badge.svg?branch=master
[cov]: https://coveralls.io/github/opentracing-contrib/scala-concurrent?branch=master
[maven-img]: https://img.shields.io/maven-central/v/io.opentracing.contrib/opentracing-scala-concurrent_2.12.svg
[maven]: http://search.maven.org/#search%7Cga%7C1%7Copentracing-scala-concurrent_2.12
25 changes: 25 additions & 0 deletions pom.xml
Expand Up @@ -67,6 +67,9 @@

<!--<scala.compat.version>2.11</scala.compat.version>-->
<!--<scala.version>2.11.12</scala.version>-->

<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -170,6 +173,7 @@
<exclude>mvnw</exclude>
<exclude>mvnw.cmd</exclude>
<exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
<exclude>.coveralls.yml</exclude>
</excludes>
</configuration>
<executions>
Expand Down Expand Up @@ -207,6 +211,27 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
<configuration>
<sourceDirectories>src/main/scala</sourceDirectories>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 21077ee

Please sign in to comment.