Skip to content
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

Jump to bottom

Full variant name support #137

Merged
merged 2 commits into from
Apr 26, 2020
Merged

Full variant name support #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dafdad1
add support for full variant names
NMGuner Apr 25, 2020
141a241
add ignore logs, fix wrong config assignment
NMGuner Apr 25, 2020
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
55 changes: 38 additions & 17 deletions source/src/main/groovy/com/kezong/fataar/FatLibraryPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class FatLibraryPlugin implements Plugin<Project> {

public static final String ARTIFACT_TYPE_JAR = 'jar'

public static final String CONFIG_SUFFIX = 'Embed'

private Project project

@Override
Expand All @@ -32,55 +34,74 @@ class FatLibraryPlugin implements Plugin<Project> {
print("Creating configuration embed\n")

project.android.buildTypes.all { buildType ->
String configName = buildType.name + 'Embed'
String configName = buildType.name + CONFIG_SUFFIX
Configuration configuration = project.configurations.create(configName)
createConfiguration(configuration)
print("Creating configuration " + configName + "\n")
}

project.android.productFlavors.all { flavor ->
String configName = flavor.name + 'Embed'
String configName = flavor.name + CONFIG_SUFFIX
Configuration configuration = project.configurations.create(configName)
createConfiguration(configuration)
print("Creating configuration " + configName + "\n")
project.android.buildTypes.all { buildType ->
String variantName = flavor.name + buildType.name.capitalize()
String variantConfigName = variantName + CONFIG_SUFFIX
Configuration variantConfiguration = project.configurations.create(variantConfigName)
createConfiguration(variantConfiguration)
print("Creating configuration " + variantConfigName + "\n")
}
}

// project.android.libraryVariants.all { variant ->
// String configName = variant.name + 'Embed'
// final Configuration configuration = project.configurations.create(configName)
// createConfiguration(configuration)
// print("Configuration created: " + configName + "\n")
// }

project.afterEvaluate {
Set<ResolvedArtifact> commonArtifacts = resolveArtifacts(embedConf)
Set<ResolvedDependency> commonUnResolveArtifacts = dealUnResolveArtifacts(embedConf, commonArtifacts)
project.android.libraryVariants.all { variant ->
// String configName = variant.name + 'Embed'

String buildTypeConfigName = variant.getBuildType().name + 'Embed'
Configuration buildTypeConfiguration = project.configurations.getByName(buildTypeConfigName)
String buildTypeConfigName = variant.getBuildType().name + CONFIG_SUFFIX
Configuration buildTypeConfiguration
try {
buildTypeConfiguration = project.configurations.getByName(buildTypeConfigName)
} catch(Exception ignored) {
print("Ignored configuration " + buildTypeConfigName + "\n")
}

/**
* Doesn't support more than one flavor dimension: LibraryVariant does not have
* public interface for VariantConfiguration list(which holds flavor configs).
* Also Library plugin doesn't have API for variants in the project.
*/
String flavorConfigName = variant.getFlavorName() + 'Embed'
String flavorConfigName = variant.getFlavorName() + CONFIG_SUFFIX
Configuration flavorConfiguration
try {
flavorConfiguration = project.configurations.getByName(flavorConfigName)
} catch(Exception ignored) {}
if (flavorConfigName != CONFIG_SUFFIX) {
try {
flavorConfiguration = project.configurations.getByName(flavorConfigName)
} catch(Exception ignored) {
print("Ignored configuration " + flavorConfigName + "\n")
}
}

String variantConfigName = variant.name + CONFIG_SUFFIX
Configuration variantConfiguration
if (variantConfigName != buildTypeConfigName) {
try {
variantConfiguration = project.configurations.getByName(variantConfigName)
} catch(Exception ignored) {
print("Ignored configuration " + variantConfigName + "\n")
}
}

Set<ResolvedArtifact> artifacts = new HashSet<>()
artifacts.addAll(commonArtifacts)
artifacts.addAll(resolveArtifacts(buildTypeConfiguration))
artifacts.addAll(resolveArtifacts(flavorConfiguration))
artifacts.addAll(resolveArtifacts(variantConfiguration))

Set<ResolvedDependency> unResolveArtifacts = new HashSet<>()
unResolveArtifacts.addAll(commonUnResolveArtifacts)
unResolveArtifacts.addAll(dealUnResolveArtifacts(buildTypeConfiguration, artifacts))
unResolveArtifacts.addAll(dealUnResolveArtifacts(flavorConfiguration, artifacts))
unResolveArtifacts.addAll(dealUnResolveArtifacts(variantConfiguration, artifacts))

processVariant(variant, artifacts, unResolveArtifacts)
}
Expand Down