diff options
| author | 2020-08-21 22:13:20 -0700 | |
|---|---|---|
| committer | 2020-08-21 22:13:20 -0700 | |
| commit | a9dfe515243dd085890dfae120443b5c6f5a1ff4 (patch) | |
| tree | 75635f4b6fac9e17e213281f3e9e4b16b94ed2fa | |
| parent | Fix #303 (#308) (diff) | |
| download | enigma-fork-a9dfe515243dd085890dfae120443b5c6f5a1ff4.tar.gz enigma-fork-a9dfe515243dd085890dfae120443b5c6f5a1ff4.tar.xz enigma-fork-a9dfe515243dd085890dfae120443b5c6f5a1ff4.zip | |
Revert "Bump gradle and use the `mainClass` property"
This reverts commit 3dd11065699b39861d2db7522bb6f07c4ee94387
| -rw-r--r-- | enigma-cli/build.gradle | 6 | ||||
| -rw-r--r-- | enigma-server/build.gradle | 6 | ||||
| -rw-r--r-- | enigma-swing/build.gradle | 6 | ||||
| -rw-r--r-- | 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 3490613..fcd3f0d 100644 --- a/enigma-cli/build.gradle +++ b/enigma-cli/build.gradle | |||
| @@ -7,11 +7,9 @@ dependencies { | |||
| 7 | implementation project(':enigma') | 7 | implementation project(':enigma') |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | application { | 10 | mainClassName = 'cuchaz.enigma.command.Main' |
| 11 | mainClass = 'cuchaz.enigma.command.Main' | ||
| 12 | } | ||
| 13 | 11 | ||
| 14 | jar.manifest.attributes 'Main-Class': application.mainClass | 12 | jar.manifest.attributes 'Main-Class': mainClassName |
| 15 | 13 | ||
| 16 | publishing { | 14 | publishing { |
| 17 | publications { | 15 | publications { |
diff --git a/enigma-server/build.gradle b/enigma-server/build.gradle index c447138..2764558 100644 --- a/enigma-server/build.gradle +++ b/enigma-server/build.gradle | |||
| @@ -7,8 +7,6 @@ dependencies { | |||
| 7 | implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' | 7 | implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | application { | 10 | mainClassName = 'cuchaz.enigma.network.DedicatedEnigmaServer' |
| 11 | mainClass = 'cuchaz.enigma.network.DedicatedEnigmaServer' | ||
| 12 | } | ||
| 13 | 11 | ||
| 14 | jar.manifest.attributes 'Main-Class': application.mainClass | 12 | jar.manifest.attributes 'Main-Class': mainClassName |
diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index f776903..2966ae7 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle | |||
| @@ -14,11 +14,9 @@ dependencies { | |||
| 14 | implementation 'org.drjekyll:fontchooser:2.4' | 14 | implementation 'org.drjekyll:fontchooser:2.4' |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | application { | 17 | mainClassName = 'cuchaz.enigma.gui.Main' |
| 18 | mainClass = 'cuchaz.enigma.gui.Main' | ||
| 19 | } | ||
| 20 | 18 | ||
| 21 | jar.manifest.attributes 'Main-Class': application.mainClass | 19 | jar.manifest.attributes 'Main-Class': mainClassName |
| 22 | 20 | ||
| 23 | publishing { | 21 | publishing { |
| 24 | publications { | 22 | publications { |
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fd0c5a3..6623300 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | distributionBase=GRADLE_USER_HOME | 1 | distributionBase=GRADLE_USER_HOME |
| 2 | distributionPath=wrapper/dists | 2 | distributionPath=wrapper/dists |
| 3 | distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip | 3 | distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip |
| 4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |