Do not load JvmPackageName-annotated parts on Kotlin < 1.2

2017-09-06 15:28:13 +03:00
parent 70ae1596fb
commit 2bb437b219
11 changed files with 32 additions and 6 deletions
@@ -77,12 +77,14 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
                        packageParts.addPart(internalNameOf(packageFqName, partShortName), facadeInternalName)
                    }

-                    for ((index, partShortName) in proto.classWithJvmPackageNameShortNameList.withIndex()) {
-                        val packageId = proto.classWithJvmPackageNamePackageIdList.getOrNull(index)
-                                        ?: proto.classWithJvmPackageNamePackageIdList.lastOrNull()
-                                        ?: continue
-                        val jvmPackageName = table.jvmPackageNameList.getOrNull(packageId) ?: continue
-                        packageParts.addPart(internalNameOf(jvmPackageName, partShortName), null)
+                    if (configuration.isJvmPackageNameSupported) {
+                        for ((index, partShortName) in proto.classWithJvmPackageNameShortNameList.withIndex()) {
+                            val packageId = proto.classWithJvmPackageNamePackageIdList.getOrNull(index)
+                                            ?: proto.classWithJvmPackageNamePackageIdList.lastOrNull()
+                                            ?: continue
+                            val jvmPackageName = table.jvmPackageNameList.getOrNull(packageId) ?: continue
+                            packageParts.addPart(internalNameOf(jvmPackageName, partShortName), null)
+                        }
                    }
                }