From 46acb4c226ac812e8fce96864ad1b66b5352abca Mon Sep 17 00:00:00 2001 From: Appcelerator Build Date: Mon, 24 Aug 2020 22:50:41 -0400 Subject: [PATCH] [Backport 9_1_X] fix(android): native modules should use min sdk for dependency (#11953) * fix(android): modules should not depend on internal modules * fix(android): pom should use manifest minsdk Co-authored-by: Gary Mathews --- android/cli/commands/_buildModule.js | 1 + android/templates/module/generated/build.gradle | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js index a8767530023..03ba78bb9f7 100644 --- 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 index 666066cebc0..4e564f9e67f 100644 --- 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) + } } } }