Updated Blade Engine to v1.3.2

Author: bladecoder

adventure-test-project/android/AndroidManifest.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bladecoder.advtest"
-    android:versionCode="1"
-    android:versionName="1.0" >
+>
 
    <uses-sdk android:minSdkVersion="15"
-       android:targetSdkVersion="23" />
+			android:targetSdkVersion="26" />
 
     <uses-feature android:glEsVersion="0x00020000"
 			android:required="true" />
@@ -16,7 +15,7 @@
         android:label="@string/app_name"
         android:theme="@style/GdxTheme" >
         <activity
-            android:name="com.bladecoder.engine.android.AndroidLauncher"
+            android:name="com.bladecoder.advtest.AndroidLauncher"
             android:label="@string/app_name" 
             android:screenOrientation="landscape"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize">

adventure-test-project/android/build.gradle

@@ -1,59 +1,122 @@
+apply plugin: 'android'
+
 android {
-    buildToolsVersion "23.0.3"
-    compileSdkVersion 23
-        sourceSets {
+    buildToolsVersion latestBuildToolsAvailable("26.0.2")
+    compileSdkVersion highestSdkAvailable(26)
+
+    defaultConfig {
+        applicationId "com.bladecoder.advtest"
+        minSdkVersion 15
+        targetSdkVersion 26 
+        versionName version
+
+        if(project.hasProperty('versionCode'))
+          versionCode project.versionCode.toInteger()
+        else
+          versionCode 1
+
+	    buildConfigField "int", "EXPANSION_FILE_VERSION", "0"
+    }
+
+    productFlavors {
+	    full {
+	    }
+
+        expansion {
+		    buildConfigField "int", "EXPANSION_FILE_VERSION",  String.valueOf(android.defaultConfig.versionCode)
+        }
+    }
+
+    sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
+            java.srcDirs = ['src/main/java']
+            aidl.srcDirs = ['src/main/java']
+            renderscript.srcDirs = ['src/main/java']
             res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
             jniLibs.srcDirs = ['libs']
         }
 
+	full.assets.srcDirs = ['../assets']
+ 	expansion.assets.srcDirs = ['../base-assets']
+
         instrumentTest.setRoot('tests')
-        
-        
     }
 
-       
-    defaultConfig {
-        applicationId "com.bladecoder.advtest"
-        minSdkVersion 15
-		targetSdkVersion 23
-    }
+  packagingOptions {
+    // Preventing from license violations (more or less):
+    pickFirst 'META-INF/LICENSE.txt'
+    pickFirst 'META-INF/LICENSE'
+    pickFirst 'META-INF/license.txt'
+    pickFirst 'META-INF/LGPL2.1'
+    pickFirst 'META-INF/NOTICE.txt'
+    pickFirst 'META-INF/NOTICE'
+    pickFirst 'META-INF/notice.txt'
+    // Excluding unnecessary meta-data:
+    exclude 'META-INF/robovm/ios/robovm.xml'
+    exclude 'META-INF/DEPENDENCIES.txt'
+    exclude 'META-INF/DEPENDENCIES'
+    exclude 'META-INF/dependencies.txt'
+  }    
 
-	if(project.hasProperty('keystore')) {   
+    if(project.hasProperty('keystore')) {
           signingConfigs {
             release {
-            storeFile file(project.keystore)
-            storePassword project.storePassword
-            keyAlias project.alias
-            keyPassword project.keyPassword
+              storeFile file(project.keystore)
+              storePassword project.storePassword
+              keyAlias project.alias
+              keyPassword project.keyPassword
             }
           }
-          
-		  buildTypes {
-           	release {
-            	signingConfig signingConfigs.release
-             }
+
+          buildTypes {
+            release {
+            	  signingConfig signingConfigs.release
+            }
           }
-       }
+    }
+
+    buildTypes {
+          release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+           }
+    }
+}
+
+configurations { natives }
+
+dependencies {
+   	compile project(":core")
+        compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
+        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
+        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
+        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
+        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
+        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
 }
 
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
-task copyAndroidNatives() { 
+task copyAndroidNatives() {
     file("libs/armeabi/").mkdirs();
     file("libs/armeabi-v7a/").mkdirs();
+    file("libs/arm64-v8a/").mkdirs();
+    file("libs/x86_64/").mkdirs();
     file("libs/x86/").mkdirs();
 
     configurations.natives.files.each { jar ->
         def outputDir = null
+        if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
         if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
         if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
+        if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
         if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
         if(outputDir != null) {
             copy {
@@ -84,7 +147,28 @@ task run(type: Exec) {
     }
 
     def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.bladecoder.advtest/com.bladecoder.engine.android.AndroidLauncher'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', android.defaultConfig.applicationId + '/' + android.defaultConfig.applicationId + '.AndroidLauncher'
+}
+
+task('packageMainExpansionFile', type: Zip) {
+
+   FileTree tree = fileTree(dir: '../assets')
+
+   from tree
+   //into 'assets'
+
+   // Expansion file name format: main.versionCode.packageName.obb
+   entryCompression = ZipEntryCompression.STORED
+   archiveName = 'main.' + android.defaultConfig.versionCode + "." + android.defaultConfig.applicationId + ".obb"
+
+   println "Generating main." + archiveName
+
+}
+
+tasks.whenTaskAdded { task ->
+   if(task.name == 'generateExpansionReleaseBuildConfig') {
+       task.dependsOn packageMainExpansionFile
+   }
 }
 
 // sets up the Android Eclipse project, using the old Ant based build.
@@ -93,18 +177,18 @@ eclipse {
     // ignores any nodes added in classpath.file.withXml
     sourceSets {
         main {
-            java.srcDirs "src", 'gen'
+            java.srcDirs "src/main/java", 'gen'
         }
     }
 
     jdt {
-        sourceCompatibility = 1.6
-        targetCompatibility = 1.6
+        sourceCompatibility=1.7
+        targetCompatibility=1.7
     }
 
     classpath {
-        plusConfigurations += [ project.configurations.compile ]        
-        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'       
+        plusConfigurations += [ project.configurations.compile ]
+        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'
     }
 
     project {
@@ -122,7 +206,7 @@ eclipse {
 idea {
     module {
         sourceDirs += file("src");
-        scopes = [ COMPILE: [plus:[project.configurations.compile]]]        
+        scopes = [ COMPILE: [plus:[project.configurations.compile]]]
 
         iml {
             withXml {
@@ -139,4 +223,44 @@ idea {
             }
         }
     }
+}
+
+
+int highestSdkAvailable(int defaultSdk) {
+  try {
+      def buildToolsDir = new File(android.getSdkDirectory().toString(), "platforms")
+      def sdks = buildToolsDir.list([accept:{ d, f-> f.startsWith("android-") && new File(d, f).isDirectory() }] as FilenameFilter).sort { a, b -> b <=> a }
+      def highestSdk = sdks[0]
+      if (highestSdk != null) {
+          println "Using highest found SDK " + highestSdk.substring(8)
+          highestSdk.substring(8).toInteger()
+      } else {
+          println "No installed SDKs found. Using default SDK " + defaultSdk
+          defaultSdk
+      }
+  } catch (any) {
+      println "Exception while determining highest SDK. Using default SDK " +
+              defaultSdk
+      defaultSdk
+  }
+}
+
+String latestBuildToolsAvailable(String defaultBuildTools) {
+  try {
+      def buildToolsDir = new File(android.getSdkDirectory().toString(), "build-tools")
+      def buildToolsVersions = buildToolsDir.list([accept:{ d, f-> new File(d, f).isDirectory() }] as FilenameFilter).sort { a, b -> b <=> a }
+      def latestBuildTools = buildToolsVersions[0]
+      if (latestBuildTools != null) {
+          println "Using latest found build tools " + latestBuildTools
+          latestBuildTools
+      } else {
+          println "No installed build tools found. Using default build tools " +
+                  defaultBuildTools
+          defaultBuildTools
+      }
+  } catch (any) {
+      println "Exception while determining latest build tools. Using default build tools " +
+              defaultBuildTools
+      defaultBuildTools
+  }
 }

adventure-test-project/android/ic_launcher-web.png

@@ -1,14 +1,9 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+# This file is used by the Eclipse ADT plugin. It is unnecessary for IDEA and Android Studio projects, which
+# configure Proguard and the Android target via the build.gradle file.
+
+# To enable ProGuard to work with Eclipse ADT, uncomment this (available properties: sdk.dir, user.home)
+# and ensure proguard.jar in the Android SDK is up to date (or alternately reduce the android target to 23 or lower):
+# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-rules.pro
 
 # Project target.
-target=android-23
+target=android-26

adventure-test-project/android/libs/arm64-v8a/libgdx-freetype.so

@@ -1,11 +1,12 @@
-package com.bladecoder.engine.android;
+package com.bladecoder.advtest;
+
+import com.bladecoder.engine.BladeEngine;
 
 import android.os.Bundle; 
 import android.view.WindowManager;
 
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-import com.bladecoder.engine.BladeEngine;
 
 public class AndroidLauncher extends AndroidApplication {
     @Override
@@ -15,7 +16,7 @@ public void onCreate(Bundle savedInstanceState) {
         AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
         cfg.useAccelerometer = false;
         cfg.useCompass = false;
-//        cfg.numSamples = 2;
+        //cfg.numSamples = 2;
         cfg.useImmersiveMode = true;
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

adventure-test-project/android/libs/arm64-v8a/libgdx.so

@@ -1,11 +1,10 @@
-#Mon Oct 23 11:17:51 CEST 2017
-roboVMVersion=2.3.3
+bladeEngineVersion=1.3.2
 debug=false
-gdxVersion=1.9.7
 fast_leave=true
-bladeEngineVersion=1.3.2-SNAPSHOT
-version=unspecified
-title=Blade Engine Adventure
-ui_mode=PIE
+gdxVersion=1.9.7
 inventory_pos=down
 pie_mode.desktop=false
+roboVMVersion=2.3.3
+title=Blade Engine Adventure
+ui_mode=PIE
+version=19