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

Update bootstrap to 1.2.40-dev-165

Browse Source
This commit is contained in:
Alexander Udalov
2018-02-07 23:22:52 +01:00
parent 0954d1ab1b
commit bb013ec2bf
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
buildscript { buildscript {
extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT" 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( val repos = listOfNotNull(
bootstrapKotlinRepo, bootstrapKotlinRepo,
libraries/reflect/build.gradle.kts
+4 -7
View File
@@ -1,10 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer 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.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
// NOTE: Rename JvmPackageTable to ModuleProtoBuf upon the next update of the bootstrap compiler
import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
import proguard.gradle.ProGuardTask import proguard.gradle.ProGuardTask
import shadow.org.apache.tools.zip.ZipEntry import shadow.org.apache.tools.zip.ZipEntry
import shadow.org.apache.tools.zip.ZipOutputStream 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() } val version = IntArray(input.readInt()) { input.readInt() }
logger.info("Transforming ${context.path} with version ${version.toList()}") 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) { for (packageParts in table.packagePartsList + table.metadataPartsList) {
addPackageParts(JvmPackageTable.PackageParts.newBuilder(packageParts).apply { addPackageParts(JvmModuleProtoBuf.PackageParts.newBuilder(packageParts).apply {
packageFqName = relocate(packageFqName) packageFqName = relocate(packageFqName)
}) })
} }