Reverted to more stable gradle plugin (+added retrolambda because lambdas aren't supported on stable yet);

Rebuilt cmake libs in release;
Fixed launcher losing some vcmi config options;

Author: Fayth

build.py

@@ -11,6 +11,7 @@
 PARAM_FIXES = 0
 PARAM_BUILD_EXT = 1
 PARAM_BUILD_CMAKE = 2
+PARAM_BUILD_APP = 3
 
 def copyLibs():
 	vcmiutil.copytree("./libs/", conf["extOutput"])
@@ -69,7 +70,13 @@ def buildFFMPEG():
 def buildCMakeExternals():	
 	os.chdir("project")
 	os.environ["JAVA_HOME"] = conf["javaRoot"]
-	cmd = "gradlew -a :vcmi-app:compileLibsOnlyDebugSources"
+	cmd = "gradlew -a :vcmi-app:compileLibsOnly{}Sources".format(conf["cmakeBuildMode"])
+	assertZero(os.system(cmd), cmd)
+	
+def buildApp():	
+	os.chdir("project")
+	os.environ["JAVA_HOME"] = conf["javaRoot"]
+	cmd = "gradlew -a :vcmi-app:assembleVcmiOnly{}".format(conf["cmakeBuildMode"])
 	assertZero(os.system(cmd), cmd)
 
 def buildAllOptional():
@@ -91,17 +98,18 @@ def inputError():
 
 args = len(sys.argv)
 if args < 2:
-	print("run with any of these: all, build, fixpaths")
-	sys.exit(1)
+	inputError()
 
-parsedParams = [False, False, False]
+parsedParams = [False, False, False, False]
 for arg in sys.argv[1:]:
 	if arg == "all" or arg == "build-optional":
 		parsedParams[PARAM_BUILD_EXT] = True
 	if arg == "all" or arg == "build-cmake":
 		parsedParams[PARAM_BUILD_CMAKE] = True
 	if arg == "all" or arg == "fixpaths":
 		parsedParams[PARAM_FIXES] = True
+	if arg == "all" or arg == "build-app":
+		parsedParams[PARAM_BUILD_APP] = True
 
 executedAnything = False
 if parsedParams[PARAM_FIXES]:
@@ -113,6 +121,9 @@ def inputError():
 if parsedParams[PARAM_BUILD_CMAKE]:
 	buildAllCmake()
 	executedAnything = True
+if parsedParams[PARAM_BUILD_APP]:
+	timed(buildApp, "app")
+	executedAnything = True
 
 if executedAnything == False:
 	inputError()

ext-output/arm64-v8a/libboost-datetime.so

@@ -3,9 +3,11 @@ buildscript {
 
     repositories {
         jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
+        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'me.tatarka:gradle-retrolambda:3.6.1'
     }
 }
 

ext-output/arm64-v8a/libboost-filesystem.so

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip

ext-output/arm64-v8a/libboost-locale.so

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion VCMI_COMPILE_SDK

ext-output/arm64-v8a/libboost-program-options.so

@@ -134,7 +134,7 @@ private String toJson() throws JSONException
         final JSONObject generalNode = accessGeneralNode(mRawObject);
         final JSONObject screenResNode = accessScreenResNode(mRawObject);
 
-        final JSONObject root = new JSONObject();
+        final JSONObject root = mRawObject;
         final JSONObject general = generalNode == null ? new JSONObject() : generalNode;
         final JSONObject video = new JSONObject();
         final JSONObject screenRes = screenResNode == null ? new JSONObject() : screenResNode;

ext-output/arm64-v8a/libboost-system.so

@@ -10,5 +10,6 @@
 	"javaRoot": "Q:/P/Java/8",
 	"abis" : "armeabi-v7a arm64-v8a x86 x86_64",
 	"boostFolderName" : "boost_1_64_0",
-	"androidApi" : 21
+	"androidApi" : 21,
+	"cmakeBuildMode" : "Release"
 }