Skip to content

feat(plugin): support flavor dimensions #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c86y wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(plugin): support flavor dimensions #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions AndResGuard-gradle-plugin/src/main/groovy/com/tencent/gradle/AndResGuardTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ class AndResGuardTask extends DefaultTask {
android.applicationVariants.all { variant ->
variant.outputs.each { output ->
// remove "resguard"
String variantName = this.name["resguard".length()..-1]
if (variantName.equalsIgnoreCase(variant.buildType.name as String) || isTargetFlavor(variantName,
variant.productFlavors, variant.buildType.name) ||
variantName.equalsIgnoreCase(AndResGuardPlugin.USE_APK_TASK_NAME)) {
String taskVariantName = this.name["resguard".length()..-1]
if (taskVariantName.equalsIgnoreCase(variant.buildType.name as String) || isTargetFlavor(taskVariantName, variant) ||
taskVariantName.equalsIgnoreCase(AndResGuardPlugin.USE_APK_TASK_NAME)) {
buildConfigs << new BuildInfo(output.outputFile,
variant.variantData.variantConfiguration.signingConfig,
variant.variantData.variantConfiguration.applicationId,
variant.buildType.name,
variant.productFlavors,
variantName,
taskVariantName,
variant.mergedFlavor.minSdkVersion.apiLevel)

}
Expand All @@ -52,12 +51,18 @@ class AndResGuardTask extends DefaultTask {
}
}

static isTargetFlavor(variantName, flavors, buildType) {
if (flavors.size() > 0) {
String flavor = flavors.get(0).name
return variantName.equalsIgnoreCase(flavor) || variantName.equalsIgnoreCase([flavor, buildType].join(""))
static isTargetFlavor(taskVariantName, variant) {
def isTarget = true
def variantName = variant.name.capitalize()
String[] taskVariantNames = taskVariantName.split("(?=\\p{Upper})")

taskVariantNames.each { name ->
if (!variantName.contains(name)) {
isTarget = false
}
}
return false

return isTarget
}

static useFolder(file) {
Expand Down