From 6352efaa96a82a2965f1f7ea36a8fdd4e4bbc3ca Mon Sep 17 00:00:00 2001 From: Chad Retz Date: Wed, 12 Sep 2018 16:01:46 -0500 Subject: [PATCH] Update Kotlin and ASM --- build.gradle | 5 ++--- compiler/src/main/kotlin/asmble/compile/jvm/Linker.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2d6e003..67aa643 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ group 'asmble' version '0.2.0' buildscript { - ext.kotlin_version = '1.2.51' - ext.asm_version = '5.2' + ext.kotlin_version = '1.2.61' + ext.asm_version = '6.2.1' repositories { mavenCentral() @@ -55,7 +55,6 @@ project(':compiler') { compile "org.ow2.asm:asm-util:$asm_version" testCompile 'junit:junit:4.12' testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" - testCompile "org.ow2.asm:asm-debug-all:$asm_version" } publishSettings(project, 'asmble-compiler', 'Asmble WASM Compiler', false) diff --git a/compiler/src/main/kotlin/asmble/compile/jvm/Linker.kt b/compiler/src/main/kotlin/asmble/compile/jvm/Linker.kt index 5e74461..168f8f8 100644 --- a/compiler/src/main/kotlin/asmble/compile/jvm/Linker.kt +++ b/compiler/src/main/kotlin/asmble/compile/jvm/Linker.kt @@ -201,7 +201,7 @@ open class Linker { "instance" + mod.name.javaIdent.capitalize(), mod.ref.asmDesc), InsnNode(Opcodes.ARETURN) ) - ctx.cls.methods.plusAssign(func) + ctx.cls.methods.plusAssign(func.toMethodNode()) } class ModuleClass(val cls: Class<*>, overrideName: String? = null) {