Merge branch 'master' into TIMOB-27987_1

tidev · Aug 27, 2020 · a80e6e9 · a80e6e9
2 parents e041b6a + d445877
commit a80e6e9
Show file tree

Hide file tree

Showing 12 changed files with 874 additions and 566 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -11,7 +11,7 @@ jobs:
     name: Backport
     steps:
       - name: Backport
-        uses: ewanharris/backport@v1.0.28-13
+        uses: ewanharris/backport@v1.0.28-21
         with:
           bot_username: build
           bot_token: d5bd2737eafb4b5b5c1040e2d71e86626f8ce1b5

diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
@@ -574,6 +574,7 @@ AndroidModuleBuilder.prototype.generateModuleProject = async function generateMo
 		moduleMavenArtifactId: mavenArtifactId,
 		moduleName: this.manifest.name,
 		moduleVersion: this.manifest.version,
+		moduleMinSdkVersion: this.manifest.minsdk,
 		moduleArchitectures: this.manifest.architectures.split(' '),
 		tiBindingsJsonPath: path.join(this.platformPath, 'titanium.bindings.json'),
 		tiMavenUrl: encodeURI('file://' + path.join(this.platformPath, 'm2repository').replace(/\\/g, '/')),

diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
@@ -250,7 +250,13 @@ publishing {
 						def childNode = dependenciesNode.appendNode('dependency')
 						childNode.appendNode('groupId', it.group)
 						childNode.appendNode('artifactId', it.name)
-						childNode.appendNode('version', it.version)
+
+						// Use minimum SDK specified by module manifest.
+						if ((it.group == 'org.appcelerator') && (it.name == 'titanium')) {
+							childNode.appendNode('version', '<%- moduleMinSdkVersion %>')
+						} else {
+							childNode.appendNode('version', it.version)
+						}
 					}
 				}
 			}

diff --git a/common/Resources/ti.internal/extensions/node/process.js b/common/Resources/ti.internal/extensions/node/process.js
@@ -217,6 +217,7 @@ process.versions = {
 	jsc: '' // TODO: report javascriptcore version for iOS/WIndows?
 	// TODO: Report ios/Android/Windows platform versions?
 };
+process[Symbol.toStringTag] = 'process';
 
 global.process = process;
 // handle spitting out warnings

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
@@ -674,9 +674,11 @@ - (void)addCornerRadius:(NSArray *)radiusArray toLayer:(CALayer *)viewLayer
     bottomLeftRadius = radius;
     topRightRadius = radius;
   } else if (radiusArray.count == 1) {
-    // For same corner radius, no need to create bezier path. Use CALayer's cornerRadius.
-    viewLayer.cornerRadius = [self radiusFromObject:radiusArray[0]];
-    return;
+    CGFloat radius = [self radiusFromObject:radiusArray[0]];
+    topLeftRadius = radius;
+    topRightRadius = radius;
+    bottomRightRadius = radius;
+    bottomLeftRadius = radius;
   }
 
   CAShapeLayer *shapeLayer = [[CAShapeLayer alloc] initWithLayer:viewLayer];
@@ -727,6 +729,11 @@ - (void)updateBorderRadius:(id)radius
   [self updateClipping];
 }
 
+- (void)setBorderRadius_:(id)radius
+{
+  [self updateBorderRadius:radius];
+}
+
 - (void)setAnchorPoint_:(id)point
 {
   self.layer.anchorPoint = [TiUtils pointValue:point];