Merge branch '6_1_X' into TIMOB-24801-6_1_X

tidev · Jun 22, 2017 · 52a072d · 52a072d
2 parents df8d66d + c75df5d
commit 52a072d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/android/cli/hooks/aar-transform.js b/android/cli/hooks/aar-transform.js
@@ -43,6 +43,7 @@ exports.cliVersion = '>=3.2';
 
 exports.init = function (logger, config, cli, appc) {
 	cli.on('build.pre.compile', {
+		priority: 1100,
 		post: function(builder, callback) {
 			registerHyperloopCompatibilityFixes(cli, builder, appc, logger);
 			scanProjectAndStartTransform(builder, logger, callback);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -1578,7 +1578,6 @@ protected void onDestroy()
 		if (window != null) {
 			window.closeFromActivity(isFinishing);
 			window.releaseViews();
-			window.removeAllChildren();
 			window.releaseKroll();
 			window = null;
 		}

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "iphone": "2",
     "android": "3",
     "mobileweb": "2",
-    "windows": "2"
+    "windows": "3"
   },
   "keywords": [
     "appcelerator",