Resync fork

.gitignore

@@ -22,10 +22,9 @@
 .DS_Store
 /jme3-core/src/main/resources/com/jme3/system/version.properties
 /jme3-*/build/
-/jme3-bullet-native/bullet.zip
 /jme3-bullet-native/bullet3.zip
-/jme3-bullet-native/bullet-2.82-r2704/
-/jme3-bullet-native/bullet3-2.83.7/
+/jme3-bullet-native/bullet3-2.86.1/
+/jme3-bullet-native/src/native/cpp/com_jme3_bullet_*.h
 /jme3-android-native/openal-soft/
 /jme3-android-native/OpenALSoft.zip
 /jme3-android-native/src/native/jme_decode/STBI/

.travis.yml

@@ -1,6 +1,5 @@
 language: java
-sudo: false
-dist: precise
+sudo: true
 
 branches:
   only:
@@ -15,7 +14,9 @@ matrix:
     env: UPLOAD=true UPLOAD_NATIVE=true
   - os: linux
     jdk: openjdk7
+    dist: precise
   - os: osx
+    osx_image: xcode9.3
     env: UPLOAD_NATIVE=true
 
 addons:

appveyor.yml

@@ -41,6 +41,8 @@ deploy: off
 
 on_success:
 - cmd: >-
+    if not defined encrypted_f0a0b284e2e8_key appveyor exit
+
     openssl aes-256-cbc -K %encrypted_f0a0b284e2e8_key% -iv %encrypted_f0a0b284e2e8_iv% -in private\key.enc -out c:\users\appveyor\.ssh\id_rsa -d
 
     git config --global user.email "appveyor"

build.gradle

@@ -1,10 +1,11 @@
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
@@ -115,10 +116,6 @@ task mergedSource(type: Copy){
 
 }
 
-task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
-    gradleVersion = '4.1'
-}
-
 ext {
     ndkCommandPath  = ""
     ndkExists       = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 17 22:55:30 EDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

jme3-bullet-native/build.gradle

@@ -11,6 +11,16 @@ if (!hasProperty('mainClass')) {
 dependencies {
     compile project(':jme3-bullet')
 }
+clean { dependsOn 'cleanHeaders', 'cleanUnzipped' }
+
+// clean up auto-generated C++ headers
+task cleanHeaders(type: Delete) {
+    delete fileTree(dir: 'src/native/cpp', include: 'com_jme3_bullet_*.h')
+}
+// clean up unzipped files
+task cleanUnzipped(type: Delete) {
+    delete bulletFolder
+}
 
 model {
     components {
@@ -77,6 +87,7 @@ model {
                 return
             }
 
+            cppCompiler.define('BT_NO_PROFILE')
             if (toolChain in VisualCpp) {
                 cppCompiler.args "/I$javaHome\\include"
             } else{
@@ -115,7 +126,10 @@ model {
                 cppCompiler.define('WIN32')
             }
 
-            tasks.all { dependsOn unzipBulletIfNeeded }
+            tasks.all { 
+                dependsOn unzipBulletIfNeeded
+                dependsOn ':jme3-bullet:generateNativeHeaders'
+            }
 
             // Add output to jar file
             jar.into("native/${os}/${arch}") {
@@ -199,7 +213,7 @@ unzipBulletIfNeeded.dependsOn {
     }
 }
 
-// Helper class to wrap ant dowload task
+// Helper class to wrap ant download task
 class MyDownload extends DefaultTask {
     @Input
     String sourceUrl