Update Kotlin and ASM

This commit is contained in:
Chad Retz 2018-09-12 16:01:46 -05:00
parent 326a0cdaba
commit 6352efaa96
2 changed files with 3 additions and 4 deletions

View File

@ -2,8 +2,8 @@ group 'asmble'
version '0.2.0' version '0.2.0'
buildscript { buildscript {
ext.kotlin_version = '1.2.51' ext.kotlin_version = '1.2.61'
ext.asm_version = '5.2' ext.asm_version = '6.2.1'
repositories { repositories {
mavenCentral() mavenCentral()
@ -55,7 +55,6 @@ project(':compiler') {
compile "org.ow2.asm:asm-util:$asm_version" compile "org.ow2.asm:asm-util:$asm_version"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" 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) publishSettings(project, 'asmble-compiler', 'Asmble WASM Compiler', false)

View File

@ -201,7 +201,7 @@ open class Linker {
"instance" + mod.name.javaIdent.capitalize(), mod.ref.asmDesc), "instance" + mod.name.javaIdent.capitalize(), mod.ref.asmDesc),
InsnNode(Opcodes.ARETURN) InsnNode(Opcodes.ARETURN)
) )
ctx.cls.methods.plusAssign(func) ctx.cls.methods.plusAssign(func.toMethodNode())
} }
class ModuleClass(val cls: Class<*>, overrideName: String? = null) { class ModuleClass(val cls: Class<*>, overrideName: String? = null) {