From 66e0b07428e5865a502594ff261b6be2290598e2 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Tue, 7 Jan 2020 01:29:25 +0100
Subject: [PATCH] gradle updates

---
 compiler/build.gradle | 11 +++++------
 gradle.properties     |  2 +-
 parser/build.gradle   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 73aef6cfa..03b63b169 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -31,15 +31,14 @@ dependencies {
     implementation project(':parser')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     // implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    // runtime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    runtime 'org.antlr:antlr4-runtime:4.7.2'
-    runtime project(':parser')
+    implementation 'org.antlr:antlr4-runtime:4.7.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-cli-jvm:0.1.0-dev-5'
+    implementation project(':parser')
 
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
-    compile 'org.jetbrains.kotlinx:kotlinx-cli-jvm:0.1.0-dev-5'
 }
 
 compileKotlin {
@@ -85,8 +84,8 @@ artifacts {
 
 
 shadowJar {
-    baseName = 'prog8compiler'
-    version = prog8version
+    archiveBaseName = 'prog8compiler'
+    archiveVersion = prog8version
     // minimize()
 }
 
diff --git a/gradle.properties b/gradle.properties
index 630dd6b4d..3fd555051 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2500M
 org.gradle.daemon=true
 
-kotlinVersion=1.3.60
+kotlinVersion=1.3.61
diff --git a/parser/build.gradle b/parser/build.gradle
index 21265a88d..ce9b71094 100644
--- a/parser/build.gradle
+++ b/parser/build.gradle
@@ -21,7 +21,7 @@ configurations {
 
 dependencies {
     antlr 'org.antlr:antlr4:4.7.2'
-    compile 'org.antlr:antlr4-runtime:4.7.2'
+    implementation 'org.antlr:antlr4-runtime:4.7.2'
 
 //    antlr('org.antlr:antlr4:4.7.2') {
 //        exclude group: 'com.ibm.icu', module: 'icu4j'