Iterator garbage collection improvement

.travis.yml

@@ -1,16 +1,16 @@
 language: java
 sudo: false
-env:
- - GRADLE_USER_HOME=gradle-cache
+
+addons:
+  ssh_known_hosts: updates.jmonkeyengine.org
+
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 
 cache:
   directories:
-   - gradle-cache
-   - netbeans
-
-# branches:
-#   only:
-#   - master
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
 
 notifications:
   slack:
@@ -20,13 +20,13 @@ notifications:
       secure: "PWEk4+VL986c3gAjWp12nqyifvxCjBqKoESG9d7zWh1uiTLadTHhZJRMdsye36FCpz/c/Jt7zCRO/5y7FaubQptnRrkrRfjp5f99MJRzQVXnUAM+y385qVkXKRKd/PLpM7XPm4AvjvxHCyvzX2wamRvul/TekaXKB9Ti5FCN87s="
 
 install:
-  -  ./gradlew assemble
+  - ./gradlew assemble
 
 script:
   - ./gradlew check
-  - ./gradlew createZipDistribution
 
 before_deploy:
+  - ./gradlew createZipDistribution
   - export RELEASE_DIST=$(ls build/distributions/*.zip)
 
 deploy:

build.gradle

@@ -1,18 +1,15 @@
-import org.gradle.api.artifacts.*
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
     }
 }
 
 apply plugin: 'base'
 apply from: file('version.gradle')
-apply from: file('upload.gradle')
 
 // This is applied to all sub projects
 subprojects {
@@ -118,7 +115,7 @@ task mergedSource(type: Copy){
 }
 
 task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.13'
 }
 
 ext {

common-android-app.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-group   = 'com.jme3'
+group   = 'org.jmonkeyengine'
 version = jmeVersion + '-' + jmeVersionTag
 
 sourceCompatibility = '1.6'
@@ -10,4 +10,4 @@ repositories {
     maven {
         url "http://nifty-gui.sourceforge.net/nifty-maven-repo"
     }
-}
+}

common.gradle

@@ -67,11 +67,11 @@ task javadocJar(type: Jar, dependsOn: javadoc, description: 'Creates a jar from
     from javadoc.destinationDir
 }
 
-def pomConfig = {
+ext.pomConfig = {
     name POM_NAME
     description POM_DESCRIPTION
     url POM_URL
-    inceptionYear '2016'
+    inceptionYear POM_INCEPTION_YEAR
     scm {
         url POM_SCM_URL
         connection POM_SCM_CONNECTION
@@ -84,7 +84,6 @@ def pomConfig = {
             distribution POM_LICENSE_DISTRIBUTION
         }
     }
-    // from http://hub.jmonkeyengine.org/introduction/team/
     developers {
         developer {
             name 'jMonkeyEngine Team'
@@ -103,14 +102,15 @@ task writeFullPom {
         }.writeTo(pomFile)
     }
 }
+
 assemble.dependsOn(writeFullPom)
 install.dependsOn(writeFullPom)
 uploadArchives.dependsOn(writeFullPom)
 
 artifacts {
     archives jar
     archives sourcesJar
-    if(buildJavaDoc == "true"){
+    if (buildJavaDoc == "true") {
         archives javadocJar
     }
     archives writeFullPom.outputs.files[0]
@@ -129,13 +129,4 @@ uploadArchives {
 
         pom.project pomConfig
     }
-}
-
-task createFolders(description: 'Creates the source folders if they do not exist.') doLast {
-//    sourceSets*.allSource*.srcDirs*.each { File srcDir ->
-//        if (!srcDir.isDirectory()) {
-//            println "Creating source folder: ${srcDir}"
-//            srcDir.mkdirs()
-//        }
-//    }
-}
+}

gradle.properties

@@ -1,7 +1,7 @@
 # Version number used for plugins, only 3 numbers (e.g. 3.1.3)
-jmeVersion = 3.1.0
+jmeVersion = 3.2.0
 # Version used for application and settings folder, no spaces!
-jmeMainVersion = 3.1
+jmeMainVersion = 3.2
 # Version addition pre-alpha-svn, Stable, Beta
 jmeVersionTag = SNAPSHOT
 # Increment this each time jmeVersionTag changes but jmeVersion stays the same
@@ -36,6 +36,7 @@ POM_SCM_DEVELOPER_CONNECTION=scm:git:git@github.com:jMonkeyEngine/jmonkeyengine.
 POM_LICENSE_NAME=New BSD (3-clause) License
 POM_LICENSE_URL=http://opensource.org/licenses/BSD-3-Clause
 POM_LICENSE_DISTRIBUTION=repo
+POM_INCEPTION_YEAR=2009
 
 # Bintray settings to override in $HOME/.gradle/gradle.properties or ENV or commandline
 bintray_user=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 01 20:04:11 EST 2014
+#Sat Apr 30 16:44:31 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

jme3-android-examples/.gitignore

@@ -0,0 +1 @@
+/build

jme3-android-examples/build.gradle

@@ -1,28 +1,18 @@
-dependencies {
-    compile project(':jme3-core')
-    compile project(':jme3-android')
-    compile project(':jme3-effects')
-    compile project(':jme3-bullet')
-    compile project(':jme3-bullet-native-android')
-    compile project(':jme3-networking')
-    compile project(':jme3-niftygui')
-    compile project(':jme3-plugins')
-    compile project(':jme3-terrain')
-    compile project(':jme3-testdata')
-}
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 10
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     lintOptions {
         // Fix nifty gui referencing "java.awt" package.
         disable 'InvalidPackage'
+        abortOnError false
     }
 
     defaultConfig {
-        applicationId "com.jme3.android"
-        minSdkVersion 10       // Android 2.3 GINGERBREAD
+        applicationId "org.jmonkeyengine.jme3androidexamples"
+        minSdkVersion 15       // Android 4.0.3 ICE CREAM SANDWICH
         targetSdkVersion 22    // Android 5.1 LOLLIPOP
         versionCode 1
         versionName "1.0" // TODO: from settings.gradle
@@ -31,10 +21,39 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            applicationIdSuffix ".debug"
-            debuggable true
+    }
+
+    sourceSets {
+        main {
+            java {
+                srcDir 'src/main/java'
+            }
+            assets {
+                srcDir 'src/assets'
+                srcDir '../jme3-testdata/src/main/resources'
+                srcDir '../jme3-examples/src/main/resources'
+            }
         }
     }
-}
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.3.0'
+
+    compile project(':jme3-core')
+    compile project(':jme3-android')
+    compile project(':jme3-android-native')
+    compile project(':jme3-effects')
+    compile project(':jme3-bullet')
+    compile project(':jme3-bullet-native-android')
+    compile project(':jme3-networking')
+    compile project(':jme3-niftygui')
+    compile project(':jme3-plugins')
+    compile project(':jme3-terrain')
+    compile fileTree(dir: '../jme3-examples/build/libs', include: ['*.jar'], exclude: ['*sources*.*'])
+//    compile project(':jme3-examples')
+}

jme3-android-examples/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\potterec\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}