Skip to content

Commit

Permalink
Try to build JDK7 compatible stuff with JDK8
Browse files Browse the repository at this point in the history
  • Loading branch information
mgoellnitz committed Jan 2, 2018
1 parent f494ec0 commit b22a46f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2017 Martin Goellnitz
# Copyright 2016-2018 Martin Goellnitz
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
Expand Down Expand Up @@ -27,15 +27,15 @@ sudo: false
language: java

jdk:
- openjdk7
- oraclejdk8

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

after_success:
- gradle jacocoCombinedReport coveralls generatePomFileForMavenJavaPublication artifactoryPublish
- ./gradlew jacocoCombinedReport coveralls generatePomFileForMavenJavaPublication artifactoryPublish

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
11 changes: 3 additions & 8 deletions publication-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2015-2017 Martin Goellnitz
# Copyright 2015-2018 Martin Goellnitz
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -19,12 +19,7 @@ JDK=`ls -d /opt/*jdk*1.7*|tail -1`
if [ -z "$JDK" ] ; then
JDK=`ls -d /usr/lib/jvm/*java*1.7*|tail -1`
fi
if [ ! -z "$JDK" ] ; then
echo $JDK
export JAVA_HOME=$JDK
export PATH=$JAVA_HOME/bin:$PATH
else
if [ -z "$JDK" ] ; then
echo "Didn't find Java7 - exiting"
fi
export JAVA_OPTS="-XX:PermSize=128m -XX:MaxPermSize=256m"
./gradlew -Prelease clean build jacocoTestReport jacocoCombinedReport publishToMavenLocal
./gradlew -Pjdk=$JDK -Prelease clean build jacocoTestReport jacocoCombinedReport publishToMavenLocal

0 comments on commit b22a46f

Please sign in to comment.