From 33785860981bffb65176ba101860c4b2aa238c55 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Mon, 28 Dec 2020 00:45:20 +0100
Subject: [PATCH] update gradle to 6.7

---
 compiler/build.gradle                    | 7 ++++---
 dbusCompilerService/build.gradle         | 7 ++++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 httpCompilerService/build.gradle         | 7 ++++---
 parser/build.gradle                      | 2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/compiler/build.gradle b/compiler/build.gradle
index ecdc690ac..f539885b0 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'application'
     id "org.jetbrains.kotlin.jvm" version "1.4.21"
     id 'org.jetbrains.dokka' version "0.9.18"
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 targetCompatibility = 11
@@ -66,7 +66,8 @@ sourceSets {
 startScripts.enabled = true
 
 application {
-    mainClassName = 'prog8.CompilerMainKt'
+    mainClass = 'prog8.CompilerMainKt'
+    mainClassName = 'prog8.CompilerMainKt'  // deprecated
     applicationName = 'p8compile'
 }
 
@@ -102,5 +103,5 @@ dokka {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '6.1.1'
+    gradleVersion = '6.7'
 }
diff --git a/dbusCompilerService/build.gradle b/dbusCompilerService/build.gradle
index af47e54d5..67cec77d5 100644
--- a/dbusCompilerService/build.gradle
+++ b/dbusCompilerService/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java'
     id 'application'
     id "org.jetbrains.kotlin.jvm" version "1.4.21"
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 targetCompatibility = 11
@@ -61,7 +61,8 @@ sourceSets {
 startScripts.enabled = true
 
 application {
-    mainClassName = 'prog8.dbus.TestdbusKt'
+    mainClass = 'prog8.dbus.TestdbusKt'
+    mainClassName = 'prog8.dbus.TestdbusKt'  // deprecated
     applicationName = 'testdbus'
 }
 
@@ -91,5 +92,5 @@ test {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '6.1.1'
+    gradleVersion = '6.7'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc26..be52383ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/httpCompilerService/build.gradle b/httpCompilerService/build.gradle
index af641714e..844ed4de6 100644
--- a/httpCompilerService/build.gradle
+++ b/httpCompilerService/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java'
     id 'application'
     id "org.jetbrains.kotlin.jvm" version "1.4.21"
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 targetCompatibility = 11
@@ -64,7 +64,8 @@ sourceSets {
 startScripts.enabled = true
 
 application {
-    mainClassName = 'prog8.http.TestHttpKt'
+    mainClass = 'prog8.http.TestHttpKt'
+    mainClassName = 'prog8.http.TestHttpKt' // deprecated
     applicationName = 'testhttp'
 }
 
@@ -94,5 +95,5 @@ test {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '6.1.1'
+    gradleVersion = '6.7'
 }
diff --git a/parser/build.gradle b/parser/build.gradle
index 0e01c1c67..863215511 100644
--- a/parser/build.gradle
+++ b/parser/build.gradle
@@ -49,5 +49,5 @@ sourceSets {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '6.1.1'
+    gradleVersion = '6.7'
 }