Skip to content

Commit 2a63584

Browse files
committed
update dependencies / add script to update copyright date when updating version
1 parent 4caf1e8 commit 2a63584

File tree

7 files changed

+38
-17
lines changed

7 files changed

+38
-17
lines changed

build.gradle

+15-14
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
id 'application'
44
id 'eclipse'
55
id 'idea'
6-
id 'org.openjfx.javafxplugin' version '0.0.12'
7-
id 'io.github.goooler.shadow' version '8.1.7'
8-
id 'com.github.ben-manes.versions' version '0.42.0'
6+
id 'org.openjfx.javafxplugin' version '0.1.0'
7+
id 'com.gradleup.shadow' version '8.3.6'
8+
id 'com.github.ben-manes.versions' version '0.52.0'
99
}
1010

1111
group 'net.querz'
@@ -38,32 +38,32 @@ repositories {
3838

3939
dependencies {
4040
implementation 'com.github.Querz:NBT:6bc3de6961'
41-
implementation 'com.google.code.gson:gson:2.10.1'
42-
implementation 'it.unimi.dsi:fastutil:8.5.8'
41+
implementation 'com.google.code.gson:gson:2.12.1'
42+
implementation 'it.unimi.dsi:fastutil:8.5.15'
4343
implementation 'org.apache.logging.log4j:log4j-api:2.24.3'
4444
implementation 'org.apache.logging.log4j:log4j-core:2.24.3'
4545
implementation 'org.slf4j:slf4j-simple:2.0.16'
46-
implementation 'commons-cli:commons-cli:1.5.0'
46+
implementation 'commons-cli:commons-cli:1.9.0'
4747
implementation 'me.tongfei:progressbar:0.10.1'
48-
implementation 'org.apache.groovy:groovy-jsr223:4.0.21'
49-
implementation 'org.fxmisc.richtext:richtextfx:0.11.2'
48+
implementation 'org.apache.groovy:groovy-jsr223:4.0.26'
49+
implementation 'org.fxmisc.richtext:richtextfx:0.11.4'
5050
implementation 'org.lz4:lz4-java:1.8.0'
5151
implementation 'org.atteo.classindex:classindex:3.13'
5252
implementation 'org.iq80.leveldb:leveldb:0.12'
5353

5454
shadow 'com.github.Querz:NBT:6bc3de6961'
55-
shadow 'com.google.code.gson:gson:2.10.1'
56-
shadow 'it.unimi.dsi:fastutil:8.5.8'
55+
shadow 'com.google.code.gson:gson:2.12.1'
56+
shadow 'it.unimi.dsi:fastutil:8.5.15'
5757
shadow 'org.apache.logging.log4j:log4j-api:2.24.3'
5858
shadow 'org.apache.logging.log4j:log4j-core:2.24.3'
5959
shadow 'org.slf4j:slf4j-simple:2.0.16'
60-
shadow 'commons-cli:commons-cli:1.5.0'
60+
shadow 'commons-cli:commons-cli:1.9.0'
6161
shadow 'me.tongfei:progressbar:0.10.1'
62-
shadow 'org.apache.groovy:groovy-jsr223:4.0.21'
63-
shadow 'org.fxmisc.richtext:richtextfx:0.11.2'
62+
shadow 'org.apache.groovy:groovy-jsr223:4.0.26'
63+
shadow 'org.fxmisc.richtext:richtextfx:0.11.4'
6464
shadow 'org.lz4:lz4-java:1.8.0'
6565
shadow 'org.atteo.classindex:classindex:3.13'
66-
shadow 'org.iq80.leveldb:leveldb:0.12'
66+
shadow 'org.iq80.leveldb:leveldb:0.12'
6767

6868
annotationProcessor('org.atteo.classindex:classindex:3.13')
6969
annotationProcessor('org.apache.logging.log4j:log4j-core:2.24.3')
@@ -103,6 +103,7 @@ jar {
103103
manifest.attributes (
104104
'Main-Class': application.mainClass,
105105
'Application-Version': project.version,
106+
'Copyright': project.findProperty('application.copyright'),
106107
'Class-Path': configurations.shadow.files.stream()
107108
.filter($it -> !$it.name.startsWith('javafx')).collect{"lib/$it.name"}.join(' ')
108109
)

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
version=2.4.2
22
application.name=MCA Selector
33
application.url=https://github.com/Querz/mcaselector
4-
application.author=Querz
4+
application.author=Querz
5+
application.copyright=© 2018 - 2024 Querz

installer/init

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ projectName='mcaselector'
1313
applicationName=$(ReadGradleProperty 'application.name')
1414
applicationURL=$(ReadGradleProperty 'application.url')
1515
applicationAuthor=$(ReadGradleProperty 'application.author')
16+
applicationCopyright=$(ReadGradleProperty 'application.copyright')
1617
applicationVersion=$(ReadGradleProperty 'version')
1718

1819
# pads a string up to the given length
@@ -84,6 +85,7 @@ Installer() {
8485
sed -i "s/\${applicationName}/$applicationName/g" "$innoSetupDir/inno.iss"
8586
sed -i "s/\${applicationUrl}/${applicationURL////\\/}/g" "$innoSetupDir/inno.iss"
8687
sed -i "s/\${applicationAuthor}/$applicationAuthor/g" "$innoSetupDir/inno.iss"
88+
sed -i "s/\${applicationCopyright}/$applicationCopyright/g" "$innoSetupDir/inno.iss"
8789
sed -i "s/\${applicationVersion}/$applicationVersion/g" "$innoSetupDir/inno.iss"
8890
sed -i "s/\${applicationJar}/$projectName.jar/g" "$innoSetupDir/inno.iss"
8991
}

installer/res/inno.iss

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AppPublisher=${applicationAuthor}
77
AppPublisherURL=${applicationUrl}
88
AppSupportURL=${applicationUrl}
99
AppUpdatesURL=${applicationUrl}
10+
AppCopyright=${applicationCopyright}
1011
DefaultDirName={autopf}\\${applicationName}
1112
DisableProgramGroupPage=yes
1213
LicenseFile=LICENSE

installer/res/resource.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ VS_VERSION_INFO VERSIONINFO
88
{
99
VALUE "FileDescription", "MCA Selector\0"
1010
VALUE "FileVersion", "2.4.2.0\0"
11-
VALUE "LegalCopyright", "© 2018-2025 Querz\0"
11+
VALUE "LegalCopyright", "© 2018 - 2025 Querz\0"
1212
VALUE "OriginalFilename", "MCA Selector.exe\0"
1313
VALUE "ProductName", "MCA Selector\0"
1414
VALUE "ProductVersion", "2.4.2\0"

src/main/java/net/querz/mcaselector/ui/dialog/AboutDialog.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
import net.querz.mcaselector.util.github.VersionChecker;
2020
import net.querz.mcaselector.text.Translation;
2121
import net.querz.mcaselector.ui.UIFactory;
22+
23+
import java.io.FileInputStream;
24+
import java.io.FileReader;
2225
import java.io.IOException;
2326
import java.util.Objects;
27+
import java.util.Optional;
2428
import java.util.function.Consumer;
2529

2630
public class AboutDialog extends Alert {
@@ -57,13 +61,20 @@ public AboutDialog(Stage primaryStage) {
5761
e -> handleCheckUpdate(finalApplicationVersion,
5862
b -> versionLabel.getChildren().set(versionLabel.getChildren().size() - 1, b)));
5963

64+
String copyright = "\u00A9 Querz";
65+
try {
66+
copyright = FileHelper.getManifestAttributes().getValue("Copyright");
67+
} catch (IOException ex) {
68+
// ignore
69+
}
70+
6071
versionLabel.getChildren().add(checkForUpdates);
6172
versionLabel.getChildren().add(persistentVersionCheckResult);
6273
grid.add(versionLabel, 1, 0);
6374
grid.add(UIFactory.label(Translation.DIALOG_ABOUT_LICENSE), 0, 1);
6475
grid.add(new Label("MIT"), 1, 1);
6576
grid.add(UIFactory.label(Translation.DIALOG_ABOUT_COPYRIGHT), 0, 2);
66-
grid.add(new Label("\u00A9 2018 - 2025 Querz"), 1, 2);
77+
grid.add(new Label(copyright), 1, 2);
6778
grid.add(UIFactory.label(Translation.DIALOG_ABOUT_SOURCE), 0, 3);
6879
ImageView imgView = new ImageView(githubMark);
6980
imgView.setScaleX(0.5);

update_version

+5
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,8 @@ else
3838
fi
3939

4040
sed -i -E 's/"[0-9]+\.[0-9]+(\.[0-9]+)?\\0"/"'$applicationVersion'\\0"/g' 'installer/res/resource.rc'
41+
42+
# update copyright year
43+
sed -i -E "s/© *2018 *- *[0-9]{4}/© 2018 - $(date +%Y)/g" 'installer/res/resource.rc'
44+
sed -i -E "s/© *2018 *- *[0-9]{4}/© 2018 - $(date +%Y)/g" 'gradle.properties'
45+
sed -i -E "s/Copyright *\(c\) *2018 *- *[0-9]{4}/Copyright (c) 2018 - $(date +%Y)/g" 'LICENSE'

0 commit comments

Comments
 (0)