From 4434d31a3b28d414c87a837f8635c11ef98a74e2 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Thu, 11 Apr 2019 19:58:28 +0200 Subject: [PATCH] upgrade to Kotlin 1.3.30 and increase memory settings for command line build script --- build_the_compiler.sh | 2 +- compiler/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_the_compiler.sh b/build_the_compiler.sh index e633614f3..e9969b00a 100755 --- a/build_the_compiler.sh +++ b/build_the_compiler.sh @@ -12,7 +12,7 @@ mkdir -p ${PARSER_CLASSES} javac -d ${PARSER_CLASSES} -cp ${ANTLR_RUNTIME} ./parser/src/prog8/parser/prog8Lexer.java ./parser/src/prog8/parser/prog8Parser.java echo "Compiling the compiler itself..." -kotlinc -verbose -include-runtime -d ${COMPILER_JAR} -cp ${ANTLR_RUNTIME}:${PARSER_CLASSES} ./compiler/src/prog8 +JAVA_OPTS="-Xmx3G -Xms300M" kotlinc -verbose -include-runtime -d ${COMPILER_JAR} -jvm-target 1.8 -cp ${ANTLR_RUNTIME}:${PARSER_CLASSES} ./compiler/src/prog8 echo "Finalizing the compiler jar file..." # add the antlr parser classes diff --git a/compiler/build.gradle b/compiler/build.gradle index c666f7cc7..f83ef1ca9 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" version "1.3.21" + id "org.jetbrains.kotlin.jvm" version "1.3.30" id 'application' } @@ -8,7 +8,7 @@ repositories { jcenter() } -def kotlinVersion = '1.3.21' +def kotlinVersion = '1.3.30' dependencies { implementation project(':parser')