Merge remote-tracking branch 'sandstorm/master'

This commit is contained in:
Vaci Koblizek 2020-12-07 19:24:57 +00:00
commit 22e5ab34a9
6 changed files with 12 additions and 35 deletions

View file

@ -1,33 +0,0 @@
dist: trusty
sudo: false
language: java
env:
global:
- export PATH="$PATH:$HOME/bin"
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/lib"
- export PKG_CONFIG_PATH="$HOME/lib/pkgconfig"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-7
- g++-7
install:
- curl -O https://capnproto.org/capnproto-c++-0.8.0.tar.gz
- tar zxf capnproto-c++-0.8.0.tar.gz
- cd capnproto-c++-0.8.0
- ./configure --prefix=$HOME CC=gcc-7 CXX=g++-7
- make -j3
- make install
- cd ../
jdk:
- oraclejdk14
- openjdk14
script:
- make CC=gcc-7 CXX=g++-7
- mvn compile
- mvn test

View file

@ -1,6 +1,6 @@
# capnproto-java: Cap'n Proto for Java
[![Build Status](https://travis-ci.org/vaci/capnproto-java-rpc.svg?branch=master)](https://travis-ci.org/vaci/capnproto-java-rpc)
[![Build Status](https://github.com/vaci/capnproto-java-rpc/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/vaci/capnproto-java-rpc/actions?query=workflow%3ACI)
[Cap'n Proto](http://capnproto.org) is an extremely efficient protocol for sharing data
and capabilities, and capnproto-java is a pure Java implementation.

View file

@ -31,6 +31,8 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
<dependencies>
<dependency>

View file

@ -31,6 +31,8 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
<dependencies>
<dependency>

View file

@ -35,7 +35,11 @@
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
</properties>
<dependencies>
<dependency>

View file

@ -36,6 +36,8 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>
<dependencies>
<dependency>