From a9dfe515243dd085890dfae120443b5c6f5a1ff4 Mon Sep 17 00:00:00 2001 From: idwtd Date: Fri, 21 Aug 2020 22:13:20 -0700 Subject: Revert "Bump gradle and use the `mainClass` property" This reverts commit 3dd11065699b39861d2db7522bb6f07c4ee94387--- enigma-cli/build.gradle | 6 ++---- enigma-server/build.gradle | 6 ++---- enigma-swing/build.gradle | 6 ++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/enigma-cli/build.gradle b/enigma-cli/build.gradle index 34906131..fcd3f0d4 100644 --- a/enigma-cli/build.gradle +++ b/enigma-cli/build.gradle @@ -7,11 +7,9 @@ dependencies { implementation project(':enigma') } -application { - mainClass = 'cuchaz.enigma.command.Main' -} +mainClassName = 'cuchaz.enigma.command.Main' -jar.manifest.attributes 'Main-Class': application.mainClass +jar.manifest.attributes 'Main-Class': mainClassName publishing { publications { diff --git a/enigma-server/build.gradle b/enigma-server/build.gradle index c447138d..27645589 100644 --- a/enigma-server/build.gradle +++ b/enigma-server/build.gradle @@ -7,8 +7,6 @@ dependencies { implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' } -application { - mainClass = 'cuchaz.enigma.network.DedicatedEnigmaServer' -} +mainClassName = 'cuchaz.enigma.network.DedicatedEnigmaServer' -jar.manifest.attributes 'Main-Class': application.mainClass +jar.manifest.attributes 'Main-Class': mainClassName diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index f7769037..2966ae72 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle @@ -14,11 +14,9 @@ dependencies { implementation 'org.drjekyll:fontchooser:2.4' } -application { - mainClass = 'cuchaz.enigma.gui.Main' -} +mainClassName = 'cuchaz.enigma.gui.Main' -jar.manifest.attributes 'Main-Class': application.mainClass +jar.manifest.attributes 'Main-Class': mainClassName publishing { publications { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fd0c5a38..6623300b 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.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3