azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle: workaround the problem that getVariantDataManager is internal

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-09-10 11:04:40 +03:00
parent b1dbc89a2a
commit bb17724f96
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+2 -1
View File
@@ -326,7 +326,8 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
val plugin = (project.getPlugins().findPlugin("android") val plugin = (project.getPlugins().findPlugin("android")
?: project.getPlugins().findPlugin("android-library")) as BasePlugin ?: project.getPlugins().findPlugin("android-library")) as BasePlugin
processVariantData(plugin.getVariantManager().getVariantDataList(), project, val variantManager = AndroidGradleWrapper.getVariantDataManager(plugin)
processVariantData(variantManager.getVariantDataList(), project,
ext, plugin, aptConfigurations) ext, plugin, aptConfigurations)
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+5
View File
@@ -5,6 +5,7 @@ import com.android.build.gradle.BasePlugin
import com.android.build.gradle.api.ApkVariant import com.android.build.gradle.api.ApkVariant
import com.android.build.gradle.api.BaseVariant import com.android.build.gradle.api.BaseVariant
import com.android.build.gradle.api.TestVariant import com.android.build.gradle.api.TestVariant
import com.android.build.gradle.internal.VariantManager
import org.gradle.api.internal.DefaultDomainObjectSet import org.gradle.api.internal.DefaultDomainObjectSet
import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.api.tasks.util.PatternFilterable import org.gradle.api.tasks.util.PatternFilterable
@@ -87,4 +88,8 @@ class AndroidGradleWrapper {
} }
return list return list
} }
static def VariantManager getVariantDataManager(BasePlugin plugin) {
return plugin.getVariantManager()
}
} }