Skip to content

Commit d973625

Browse files
committed
Updated Gradle to 9.3.0
Updated plugins to latest supported versions Adjusted Log4j back to Info instead of Debug
1 parent 1e62ccc commit d973625

File tree

10 files changed

+31
-29
lines changed

10 files changed

+31
-29
lines changed

MekHQ/build.gradle

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import java.time.LocalDateTime
22

33
plugins {
44
id 'application'
5-
id 'com.palantir.git-version' version '4.0.0'
5+
id 'com.palantir.git-version' version '4.2.0'
66
id 'edu.sc.seis.launch4j' version '4.0.0'
7-
id "io.sentry.jvm.gradle" version '5.8.0'
7+
id "io.sentry.jvm.gradle" version '5.12.2'
88
id 'jacoco'
99
id 'java'
1010
id 'checkstyle'
@@ -69,38 +69,39 @@ dependencies {
6969
exclude group: 'xml-apis'
7070
}
7171

72-
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
72+
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.4'
73+
implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
7374

7475
implementation 'javax.vecmath:vecmath:1.5.2'
7576

7677
implementation 'joda-time:joda-time:2.14.0'
77-
implementation 'org.joda:joda-money:1.0.6' // Has a 2.0.2 Version
78+
implementation 'org.joda:joda-money:1.0.7' // Has a 2.0.2 Version
7879

7980
implementation 'org.apache.commons:commons-csv:1.14.1'
8081
implementation 'org.apache.commons:commons-math3:3.6.1'
81-
implementation 'org.apache.commons:commons-text:1.14.0'
82-
implementation 'org.apache.logging.log4j:log4j-core:2.25.1'
82+
implementation 'org.apache.commons:commons-text:1.15.0'
83+
implementation 'org.apache.logging.log4j:log4j-core:2.25.3'
8384

84-
implementation 'org.apache.pdfbox:pdfbox:3.0.5'
85+
implementation 'org.apache.pdfbox:pdfbox:3.0.6'
8586

86-
implementation 'org.commonmark:commonmark:0.25.1'
87+
implementation 'org.commonmark:commonmark:0.27.1'
8788

8889
implementation 'org.jfree:jfreechart:1.5.6'
8990

90-
implementation 'com.fasterxml.jackson.core:jackson-core:2.19.2'
91-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2'
92-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.2'
91+
implementation 'com.fasterxml.jackson.core:jackson-core:2.20.1'
92+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1'
93+
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1'
9394

94-
runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
95+
runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.6'
9596

9697
// Required for mml printing scaled vector graphics (SVG) - Eclipse IDE Compatibility.
9798
runtimeOnly 'xml-apis:xml-apis-ext:1.3.04'
9899

99-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
100+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.2'
100101

101-
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
102-
testImplementation 'org.mockito:mockito-core:5.18.0'
103-
testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
102+
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.2'
103+
testImplementation 'org.mockito:mockito-core:5.21.0'
104+
testImplementation 'org.mockito:mockito-junit-jupiter:5.21.0'
104105
}
105106

106107
application {
@@ -131,7 +132,7 @@ jar {
131132
}
132133

133134
checkstyle {
134-
toolVersion = '10.25.0'
135+
toolVersion = '12.3.1'
135136
configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
136137
configProperties = [
137138
'suppressionFile': file("${rootDir}/config/checkstyle/checkstyle-suppressions.xml")
@@ -500,10 +501,10 @@ test {
500501

501502
testLogging {
502503
events "failed"
503-
exceptionFormat "full"
504-
showExceptions true
505-
showCauses true
506-
showStackTraces true
504+
exceptionFormat = "full"
505+
showExceptions = true
506+
showCauses = true
507+
showStackTraces = true
507508
showStandardStreams = true
508509
}
509510

MekHQ/src/mekhq/campaign/finances/Money.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import java.math.RoundingMode;
3838
import java.util.List;
3939
import java.util.Objects;
40-
import javax.annotation.Nonnull;
4140

41+
import jakarta.annotation.Nonnull;
4242
import org.joda.money.BigMoney;
4343

4444
/**

MekHQ/src/mekhq/campaign/mission/CommonObjectiveFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import java.util.Objects;
3838
import java.util.ResourceBundle;
3939
import java.util.UUID;
40-
import javax.annotation.Nonnull;
4140

41+
import jakarta.annotation.Nonnull;
4242
import megamek.common.OffBoardDirection;
4343
import megamek.common.units.Dropship;
4444
import mekhq.MekHQ;

MekHQ/src/mekhq/campaign/universe/RegionPerimeter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
import java.util.List;
4141
import java.util.Optional;
4242
import java.util.stream.Collectors;
43-
import javax.annotation.Nonnull;
43+
44+
import jakarta.annotation.Nonnull;
4445

4546
/**
4647
* Given a list of planets, uses a convex hull algorithm to select the planets that form a polygon that completely

MekHQ/src/mekhq/gui/dialog/EditInjuryEntryDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import java.util.Objects;
4444
import java.util.ResourceBundle;
4545
import java.util.UUID;
46-
import javax.annotation.Nonnull;
4746
import javax.swing.BorderFactory;
4847
import javax.swing.JButton;
4948
import javax.swing.JComboBox;
@@ -53,6 +52,7 @@
5352
import javax.swing.JTextArea;
5453
import javax.swing.WindowConstants;
5554

55+
import jakarta.annotation.Nonnull;
5656
import megamek.client.ui.preferences.JWindowPreference;
5757
import megamek.client.ui.preferences.PreferencesNode;
5858
import megamek.logging.MMLogger;

MekHQ/src/mekhq/gui/displayWrappers/RankDisplay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
import java.util.ArrayList;
3636
import java.util.List;
37-
import javax.annotation.Nonnull;
3837

38+
import jakarta.annotation.Nonnull;
3939
import mekhq.campaign.personnel.enums.Profession;
4040
import mekhq.campaign.personnel.ranks.Rank;
4141
import mekhq.campaign.personnel.ranks.RankSystem;

MekHQ/src/mekhq/gui/model/PartsStoreModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import java.awt.Component;
3737
import java.util.ArrayList;
3838
import java.util.Objects;
39-
import javax.annotation.Nonnull;
4039
import javax.swing.JTable;
4140
import javax.swing.SwingConstants;
4241
import javax.swing.table.AbstractTableModel;
4342
import javax.swing.table.DefaultTableCellRenderer;
4443

44+
import jakarta.annotation.Nonnull;
4545
import megamek.common.annotations.Nullable;
4646
import megamek.common.rolls.TargetRoll;
4747
import mekhq.campaign.Campaign;

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)