Merge pull request #5957 from rjhancock/rjh-additional-files-to-ignore

Added user prefs files to ignore for build

Author: HammerGS

.gitignore

@@ -67,3 +67,4 @@ MekHQ.l4j.ini
 mhq-revision.txt
 
 /MekHQ/docs/OfficialUnitList.txt
+*.iml

MekHQ/build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'checkstyle'
     id 'com.palantir.git-version' version '3.1.0'
     id 'edu.sc.seis.launch4j' version '3.0.6'
-    id "io.sentry.jvm.gradle" version "4.11.0"
+    id "io.sentry.jvm.gradle" version "5.1.0"
     id 'jacoco'
     id 'java'
     id 'org.ec4j.editorconfig' version '0.1.0'
@@ -179,6 +179,15 @@ task stageFiles(type: Copy) {
     include "sentry.properties"
     include "*.ini"
 
+    // User Config Files
+    exclude "${mmconf}/clientsettings.xml"
+    exclude "${mmconf}/gameoptions.xml"
+    exclude "${mmconf}/megameklab.properties"
+    exclude "${mmconf}/megameklab.properties.bak"
+    exclude "${mmconf}/mhq.preferences"
+    exclude "${mmconf}/mm.preferences"
+    exclude "${mmconf}/mml.preferences"
+
     into fileStagingDir
 
     doLast {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum