update gradle to 6.7

This commit is contained in:
Irmen de Jong 2020-12-28 00:45:20 +01:00
parent 6777d952c1
commit 3378586098
5 changed files with 14 additions and 11 deletions

View File

@ -3,7 +3,7 @@ plugins {
id 'application' id 'application'
id "org.jetbrains.kotlin.jvm" version "1.4.21" id "org.jetbrains.kotlin.jvm" version "1.4.21"
id 'org.jetbrains.dokka' version "0.9.18" 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 targetCompatibility = 11
@ -66,7 +66,8 @@ sourceSets {
startScripts.enabled = true startScripts.enabled = true
application { application {
mainClassName = 'prog8.CompilerMainKt' mainClass = 'prog8.CompilerMainKt'
mainClassName = 'prog8.CompilerMainKt' // deprecated
applicationName = 'p8compile' applicationName = 'p8compile'
} }
@ -102,5 +103,5 @@ dokka {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '6.1.1' gradleVersion = '6.7'
} }

View File

@ -3,7 +3,7 @@ plugins {
id 'java' id 'java'
id 'application' id 'application'
id "org.jetbrains.kotlin.jvm" version "1.4.21" 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 targetCompatibility = 11
@ -61,7 +61,8 @@ sourceSets {
startScripts.enabled = true startScripts.enabled = true
application { application {
mainClassName = 'prog8.dbus.TestdbusKt' mainClass = 'prog8.dbus.TestdbusKt'
mainClassName = 'prog8.dbus.TestdbusKt' // deprecated
applicationName = 'testdbus' applicationName = 'testdbus'
} }
@ -91,5 +92,5 @@ test {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '6.1.1' gradleVersion = '6.7'
} }

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -3,7 +3,7 @@ plugins {
id 'java' id 'java'
id 'application' id 'application'
id "org.jetbrains.kotlin.jvm" version "1.4.21" 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 targetCompatibility = 11
@ -64,7 +64,8 @@ sourceSets {
startScripts.enabled = true startScripts.enabled = true
application { application {
mainClassName = 'prog8.http.TestHttpKt' mainClass = 'prog8.http.TestHttpKt'
mainClassName = 'prog8.http.TestHttpKt' // deprecated
applicationName = 'testhttp' applicationName = 'testhttp'
} }
@ -94,5 +95,5 @@ test {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '6.1.1' gradleVersion = '6.7'
} }

View File

@ -49,5 +49,5 @@ sourceSets {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '6.1.1' gradleVersion = '6.7'
} }