Merge branch 'master' into TIMOB-28231

tidev · Nov 16, 2020 · 46c698b · 46c698b
2 parents e2dbfed + 9f7191d
commit 46c698b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -13,7 +13,7 @@ android {
 	defaultConfig {
 		applicationId 'com.titanium.test'
 		minSdkVersion 19
-		targetSdkVersion 29
+		targetSdkVersion 30
 		versionCode 1
 		versionName '1.0'
 		manifestPlaceholders = project.ext.tiManifestPlaceholders

diff --git a/android/package.json b/android/package.json
@@ -26,7 +26,7 @@
 	"minSDKVersion": "19",
 	"compileSDKVersion": "30",
 	"vendorDependencies": {
-		"android sdk": ">=23.x <=29.x",
+		"android sdk": ">=23.x <=30.x",
 		"android build tools": ">=29.0.2 <=30.x",
 		"android platform tools": "30.x",
 		"android tools": "<=26.x",

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiViewProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiViewProxy.m
@@ -729,9 +729,6 @@ - (TiBlob *)toImage:(id)args
         [blob setMimeType:@"image/png" type:TiBlobTypeImage];
         UIGraphicsEndImageContext();
         if (callback != nil) {
-          DebugLog(@"[DEBUG] Since Titanium SDK 7.0.0, the toImage callback returns a single blob on iOS to match the Android / Windows behavior.");
-          DebugLog(@"[DEBUG] Please migrate your code in case you still use the old behavior. This debug-log will be removed in Titanium SDK 8.0.0");
-
           [callback call:@[ blob ] thisObject:self];
         }
       },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -112,7 +112,7 @@
     "semver": "^7.3.2",
     "simple-plist": "^1.1.1",
     "sprintf": "0.1.5",
-    "temp": "0.9.2",
+    "temp": "0.9.4",
     "wrap-ansi": "^7.0.0",
     "xcode": "^3.0.1",
     "xmldom": "^0.4.0",
@@ -147,15 +147,15 @@
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "request-promise-native": "^1.0.9",
-    "rollup": "^2.33.1",
+    "rollup": "^2.33.2",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "ssri": "^8.0.0",
     "stream-splitter": "^0.3.2",
     "strip-ansi": "^6.0.0",
     "titanium": "^5.3.0",
-    "titanium-docgen": "^4.8.3"
+    "titanium-docgen": "^4.9.1"
   },
   "repository": {
     "type": "git",

diff --git a/tests/Resources/ti.android.r.test.js b/tests/Resources/ti.android.r.test.js
@@ -163,7 +163,7 @@ describe.android('Titanium.Android.R', () => {
 				'alphabeticShortcut',
 				'alwaysDrawnWithCache',
 				'alwaysRetainTaskState',
-				'amPmBackgroundColor',
+				[ 'amPmBackgroundColor', 21 ],
 				[ 'amPmTextColor', 21 ],
 				[ 'ambientShadowAlpha', 21 ],
 				'angle',
@@ -1510,8 +1510,8 @@ describe.android('Titanium.Android.R', () => {
 			];
 			for (let prop of properties) {
 				if (Array.isArray(prop)) {
-					prop = prop[0];
 					const apiLevel = prop[1];
+					prop = prop[0];
 					if (Ti.Platform.Android.API_LEVEL < apiLevel) {
 						continue; // skip
 					}
@@ -1666,8 +1666,8 @@ describe.android('Titanium.Android.R', () => {
 			];
 			for (let prop of properties) {
 				if (Array.isArray(prop)) {
-					prop = prop[0];
 					const apiLevel = prop[1];
+					prop = prop[0];
 					if (Ti.Platform.Android.API_LEVEL < apiLevel) {
 						continue; // skip
 					}
@@ -1788,8 +1788,8 @@ describe.android('Titanium.Android.R', () => {
 			];
 			for (let prop of properties) {
 				if (Array.isArray(prop)) {
-					prop = prop[0];
 					const apiLevel = prop[1];
+					prop = prop[0];
 					if (Ti.Platform.Android.API_LEVEL < apiLevel) {
 						continue; // skip
 					}