Skip to content

Commit 93001ec

Browse files
shadowislordNehon
authored andcommitted
Fix #456
1 parent 06599d1 commit 93001ec

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apply from: file('version.gradle')
1515
subprojects {
1616
if(!project.name.equals('jme3-android-examples')) {
1717
apply from: rootProject.file('common.gradle')
18-
if (!['jme3-testdata', 'sdk'].contains(project.name)) {
18+
if (!project.name.equals('jme3-testdata')) {
1919
apply from: rootProject.file('bintray.gradle')
2020
}
2121
} else {
@@ -66,9 +66,9 @@ task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"P
6666
archiveName "jME" + jmeFullVersion + ".zip"
6767
into("/") {
6868
from {"./dist"}
69-
}
69+
}
7070
into("/sources") {
71-
from {"$buildDir/libDist/sources"}
71+
from {"$buildDir/libDist/sources"}
7272
}
7373
}
7474

@@ -88,14 +88,14 @@ task dist(dependsOn: [':jme3-examples:dist', 'mergedJavadoc']){
8888
task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') {
8989
title = 'jMonkeyEngine3'
9090
destinationDir = mkdir("dist/javadoc")
91-
91+
9292
options.encoding = 'UTF-8'
9393

9494
// Allows Javadoc to be generated on Java 8 despite doclint errors.
9595
if (JavaVersion.current().isJava8Compatible()) {
9696
options.addStringOption('Xdoclint:none', '-quiet')
9797
}
98-
98+
9999
options.overview = file("javadoc-overview.html")
100100
// Note: The closures below are executed lazily.
101101
source subprojects.collect {project ->
@@ -137,7 +137,7 @@ task configureAndroidNDK {
137137
if (System.env.ANDROID_NDK != null) {
138138
ndkBuildPath = System.env.ANDROID_NDK + File.separator + ndkBuildFile
139139
}
140-
140+
141141
if (new File(ndkBuildPath).exists()) {
142142
ndkExists = true
143143
ndkCommandPath = ndkBuildPath

common.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ repositories {
1616
maven {
1717
url "http://nifty-gui.sourceforge.net/nifty-maven-repo"
1818
}
19+
flatDir {
20+
dirs rootProject.file('lib')
21+
}
1922
}
2023

2124
dependencies {

jme3-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ if (!hasProperty('mainClass')) {
55
dependencies {
66
compile project(':jme3-core')
77
compile project(':jme3-plugins')
8-
compile files('../lib/android.jar')
8+
compileOnly 'android:android'
99
}

jme3-jbullet/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ sourceSets {
1212
}
1313

1414
dependencies {
15-
compile ('java3d:vecmath:1.3.1')
16-
compile files('../lib/jbullet.jar', '../lib/stack-alloc.jar')
15+
compile 'java3d:vecmath:1.3.1'
16+
compile 'jbullet:jbullet'
17+
compile 'stack-alloc:stack-alloc'
1718
compile project(':jme3-core')
1819
compile project(':jme3-terrain')
19-
// compile project(':jme3-bullet')
2020
}

0 commit comments

Comments
 (0)