Skip to content

Commit 7585d87

Browse files
authored
Merge pull request #129 from CodeDead/release/v1.4.0
Release/v1.4.0
2 parents bd82d70 + a775c79 commit 7585d87

30 files changed

+276
-178
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
if: ${{ matrix.os == 'ubuntu-latest' }}
2424
run: sudo apt-get install -y fuse libfuse2
2525

26-
- name: Setup JDK 21
26+
- name: Setup JDK 22
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: '21'
29+
java-version: '22'
3030
distribution: 'temurin'
3131

3232
- name: Setup Gradle
@@ -63,10 +63,10 @@ jobs:
6363
if: ${{ matrix.os == 'ubuntu-latest' }}
6464
run: sudo apt-get install -y fuse libfuse2
6565

66-
- name: Setup JDK 21
66+
- name: Setup JDK 22
6767
uses: actions/setup-java@v4
6868
with:
69-
java-version: '21'
69+
java-version: '22'
7070
distribution: 'temurin'
7171

7272
- name: Setup Gradle

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
if: ${{ matrix.os == 'ubuntu-latest' }}
2424
run: sudo apt-get install -y fuse libfuse2
2525

26-
- name: Setup JDK 21
26+
- name: Setup JDK 22
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: '21'
29+
java-version: '22'
3030
distribution: 'temurin'
3131

3232
- name: Setup Gradle

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,6 @@ This library is maintained by CodeDead. You can find more about us using the fol
115115
* [Twitter](https://twitter.com/C0DEDEAD)
116116
* [Facebook](https://facebook.com/deadlinecodedead)
117117
* [Reddit](https://reddit.com/r/CodeDead)
118+
* [ X ](https://x.com/C0DEDEAD)
118119

119120
Copyright © 2024 CodeDead

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ plugins {
1010
}
1111

1212
group 'com.codedead'
13-
version '1.3.1'
13+
version '1.4.0'
1414

1515
def currentOS = DefaultNativePlatform.currentOperatingSystem
1616

1717
java {
18-
targetCompatibility = JavaVersion.VERSION_21
19-
sourceCompatibility = JavaVersion.VERSION_21
18+
targetCompatibility = JavaVersion.VERSION_22
19+
sourceCompatibility = JavaVersion.VERSION_22
2020
}
2121

2222
application {
@@ -25,7 +25,7 @@ application {
2525
}
2626

2727
javafx {
28-
version = '22'
28+
version = '22.0.1'
2929
configuration = 'implementation'
3030
modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media']
3131
}
@@ -142,9 +142,9 @@ repositories {
142142
dependencies {
143143
implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
144144
implementation 'io.github.mkpaz:atlantafx-base:2.0.1'
145-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
146-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
147-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
145+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
146+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
147+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
148148
}
149149

150150
tasks.named('test') {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainVersion=22

gradle/wrapper/gradle-wrapper.jar

51 Bytes
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-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

src/main/java/com/codedead/opal/controller/LanguageController.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ public static int getLanguageIndexFromLocale(final String locale) {
2222
case "de-de" -> 1;
2323
case "es-es" -> 2;
2424
case "fr-fr" -> 3;
25-
case "jp-jp" -> 4;
26-
case "nl-nl" -> 5;
27-
case "ru-ru" -> 6;
28-
case "tr-tr" -> 7;
29-
case "zh-cn" -> 8;
25+
case "hi-in" -> 4;
26+
case "jp-jp" -> 5;
27+
case "nl-nl" -> 6;
28+
case "ru-ru" -> 7;
29+
case "tr-tr" -> 8;
30+
case "zh-cn" -> 9;
3031
default -> 0;
3132
};
3233
}
@@ -42,11 +43,12 @@ public static String getLocaleFromLanguageIndex(final int index) {
4243
case 1 -> "de-DE";
4344
case 2 -> "es-ES";
4445
case 3 -> "fr-FR";
45-
case 4 -> "jp-JP";
46-
case 5 -> "nl-NL";
47-
case 6 -> "ru-RU";
48-
case 7 -> "tr-TR";
49-
case 8 -> "zh-CN";
46+
case 4 -> "hi-in";
47+
case 5 -> "jp-JP";
48+
case 6 -> "nl-NL";
49+
case 7 -> "ru-RU";
50+
case 8 -> "tr-TR";
51+
case 9 -> "zh-CN";
5052
default -> DEFAULT_LOCALE;
5153
};
5254
}

0 commit comments

Comments
 (0)