Update protobuf from 2.5.0 to 2.6.1

This commit is contained in:
Alexander Udalov
2016-06-24 12:54:42 +03:00
parent cfbe48ac46
commit 4c8e8b099a
20 changed files with 2086 additions and 1988 deletions
@@ -96,10 +96,10 @@ sealed class BuiltInDefinitionFile {
val packageFqName = nameResolver.getPackageFqName(proto.`package`.getExtension(BuiltInsProtoBuf.packageFqName))
val classesToDecompile =
if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.classList.filter { classProto ->
if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.class_List.filter { classProto ->
shouldDecompileBuiltInClass(nameResolver.getClassId(classProto.fqName))
}
else proto.classList
else proto.class_List
private fun shouldDecompileBuiltInClass(classId: ClassId): Boolean {
if (classId.isNestedClass) return false