Skip to content

Commit

Permalink
Merge branch 'master' of github.com:xbuf/jme3_xbuf
Browse files Browse the repository at this point in the history
  • Loading branch information
riccardobl committed May 13, 2016
2 parents b2ddbb0 + 39c7142 commit 06242d2
Show file tree
Hide file tree
Showing 4 changed files with 373 additions and 367 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
sudo: false
language: java
env:
- GRADLE_USER_HOME=gradle-cache
- GRADLE_USER_HOME=gradle-cache
cache:
directories:
- gradle-cache
- netbeans
- gradle-cache
- netbeans
jdk:
- oraclejdk8
before_install:
- wget http://services.gradle.org/distributions/gradle-2.13-bin.zip
- unzip gradle-2.13-bin.zip
- export GRADLE_HOME=$PWD/gradle-2.13
- export PATH=$GRADLE_HOME/bin:$PATH
3 changes: 0 additions & 3 deletions jme3_xbuf_viewer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ buildscript {
apply plugin: 'java'
apply plugin: 'nebula.provided-base'
apply plugin: 'eclipse'
apply plugin: "org.xtext.xtend"

//WARNING: this project is 1.7 compatible but ModelViewer require javafx and java 8u20+ to run
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -23,7 +22,6 @@ def description = "A standalone viewer for xbuf (and some other format supported
sourceSets.main.resources.srcDir 'src/main/java'

dependencies {
compile 'org.eclipse.xtend:org.eclipse.xtend.lib:2.9.+'
compile "org.slf4j:slf4j-api:${v_slf4j}"
compile project(':jme3_xbuf_loader')
compile project(':jme3_xbuf_remote')
Expand All @@ -35,7 +33,6 @@ dependencies {
runtime "org.jmonkeyengine:jme3-desktop:${v_jme3}"
runtime "org.jmonkeyengine:jme3-lwjgl:${v_jme3}"
runtime 'ch.qos.logback:logback-classic:1.1.2'
testCompile 'junit:junit:4.12'
}

//------------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 06242d2

Please sign in to comment.