From bb013ec2bf79c36429e93351903cfc0fca353889 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 7 Feb 2018 23:22:52 +0100 Subject: [PATCH] Update bootstrap to 1.2.40-dev-165 --- build.gradle.kts | 2 +- libraries/reflect/build.gradle.kts | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2684f0acf33..70c628313e6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile buildscript { extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT" - kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.30-dev-672", onlySuccessBootstrap = false)) + kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.40-dev-165", onlySuccessBootstrap = false)) val repos = listOfNotNull( bootstrapKotlinRepo, diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 2595f26ede7..ded29d475b6 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -1,10 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext - -// NOTE: Rename JvmPackageTable to ModuleProtoBuf upon the next update of the bootstrap compiler -import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable - +import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf import proguard.gradle.ProGuardTask import shadow.org.apache.tools.zip.ZipEntry import shadow.org.apache.tools.zip.ZipOutputStream @@ -90,11 +87,11 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer { val version = IntArray(input.readInt()) { input.readInt() } logger.info("Transforming ${context.path} with version ${version.toList()}") - val table = JvmPackageTable.PackageTable.parseFrom(context.`is`).toBuilder() + val table = JvmModuleProtoBuf.Module.parseFrom(context.`is`).toBuilder() - val newTable = JvmPackageTable.PackageTable.newBuilder().apply { + val newTable = JvmModuleProtoBuf.Module.newBuilder().apply { for (packageParts in table.packagePartsList + table.metadataPartsList) { - addPackageParts(JvmPackageTable.PackageParts.newBuilder(packageParts).apply { + addPackageParts(JvmModuleProtoBuf.PackageParts.newBuilder(packageParts).apply { packageFqName = relocate(packageFqName) }) }