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

Application package from manifest file has a higher priority than the applicationId value in build.gradle (KT-10320)

Browse Source
This commit is contained in:
Yan Zhulanow
2015-12-08 18:05:44 +03:00
parent 009e3f9cd7
commit ac9a1350c2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt
+5 -2
View File
@@ -38,8 +38,11 @@ public class AndroidSubplugin : KotlinGradleSubplugin {
val mainSourceSet = sourceSets.getByName("main") val mainSourceSet = sourceSets.getByName("main")
val manifestFile = mainSourceSet.manifest.srcFile val manifestFile = mainSourceSet.manifest.srcFile
val applicationPackage = androidExtension.defaultConfig.applicationId val applicationPackage = getApplicationPackageFromManifest(manifestFile) ?: run {
?: getApplicationPackageFromManifest(manifestFile) ?: "" project.logger.warn(
"Application package name is not present in the manifest file (${manifestFile.absolutePath})")
""
}
pluginOptions += SubpluginOption("package", applicationPackage) pluginOptions += SubpluginOption("package", applicationPackage)
fun addVariant(sourceSet: AndroidSourceSet) { fun addVariant(sourceSet: AndroidSourceSet) {