From 9eed2381e3fd59da8f34719a14fc7cf70d2fca0d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 13 May 2020 23:54:50 -0400 Subject: [PATCH] v0.8.1: updated gradle to 6.4 --- desktop/build.gradle | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index 26de59efc..16ab85f4e 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -3,7 +3,6 @@ apply plugin: "java" [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' sourceCompatibility = targetCompatibility = appJavaCompatibility -ext.mainClass = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher" sourceSets.main.resources.srcDirs = [new File(project(':core').projectDir, "/src/main/assets"), new File(project(':desktop').projectDir,"/src/main/assets")] @@ -16,7 +15,7 @@ task debug(dependsOn: classes, type: JavaExec) { classpath = sourceSets.debug.runtimeClasspath + sourceSets.main.runtimeClasspath ignoreExitValue = true - main = mainClass + mainClass = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher" systemProperty 'Specification-Title', appName systemProperty 'Specification-Version', appVersionName + "-INDEV" systemProperty 'Implementation-Version', appVersionCode @@ -37,7 +36,7 @@ task release(dependsOn: compileForRelease, type: Jar) { from { configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } } manifest { - attributes 'Main-Class': mainClass + attributes 'Main-Class': "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher" attributes 'Specification-Title': appName attributes 'Specification-Version': appVersionName attributes 'Implementation-Version': appVersionCode diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c83d2a14..21a8fe405 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip