|
1 | | -@file:Suppress("UnstableApiUsage") |
2 | | - |
3 | 1 | package io.deepmedia.tools.grease |
4 | 2 |
|
5 | 3 | import com.android.build.api.component.analytics.AnalyticsEnabledVariant |
@@ -54,7 +52,6 @@ open class GreasePlugin : Plugin<Project> { |
54 | 52 |
|
55 | 53 | private val defaultIssueReporter = DefaultIssueReporter(StdLogger(StdLogger.Level.WARNING)) |
56 | 54 |
|
57 | | - @Suppress("NAME_SHADOWING") |
58 | 55 | override fun apply(target: Project) { |
59 | 56 | target.plugins.withId("com.android.library") { |
60 | 57 | val log = Logger(target, "grease") |
@@ -84,8 +81,8 @@ open class GreasePlugin : Plugin<Project> { |
84 | 81 | } |
85 | 82 | // Configure all variants. |
86 | 83 | androidComponents.onVariants { variant -> |
87 | | - val log = log.child("configureVariant") |
88 | | - log.d { "Configuring variant ${variant.name}..." } |
| 84 | + val childLog = log.child("configureVariant") |
| 85 | + childLog.d { "Configuring variant ${variant.name}..." } |
89 | 86 | target.afterEvaluate { |
90 | 87 | configure(variant, target.greaseOf(variant), target.greaseOf(variant, true)) |
91 | 88 | } |
@@ -140,7 +137,6 @@ open class GreasePlugin : Plugin<Project> { |
140 | 137 | // To retrieve the secondary files, we must query the configuration artifacts. |
141 | 138 | val primaryManifest = processManifestTask.manifestOutputFile.asFile // overwrite |
142 | 139 |
|
143 | | - @Suppress("DEPRECATION") |
144 | 140 | val mergedFlavor = componentConfig.oldVariantApiLegacySupport?.mergedFlavor |
145 | 141 |
|
146 | 142 | log.d { "Merging manifests... primary=${primaryManifest.get()}, secondary=${extraManifests.files.joinToString()}" } |
|
0 commit comments