diff --git a/app/build.gradle b/app/build.gradle index ced480ca..5018f0c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,9 +22,9 @@ dependencies { api project(':core') api project(':beacon') - compileOnly 'org.hamcrest:hamcrest:2.2' - compileOnly 'org.junit.jupiter:junit-jupiter-api:5.10.3' - compileOnly 'org.junit.jupiter:junit-jupiter-params:5.10.3' + compileOnly 'org.hamcrest:hamcrest:3.0' + compileOnly 'org.junit.jupiter:junit-jupiter-api:5.11.0' + compileOnly 'org.junit.jupiter:junit-jupiter-params:5.11.0' api 'com.vladsch.flexmark:flexmark:0.64.8' api 'com.vladsch.flexmark:flexmark-util:0.64.8' @@ -56,7 +56,7 @@ dependencies { exclude group: 'org.apache.commons', module: 'commons-lang3' } api 'org.apache.commons:commons-lang3:3.16.0' - api 'io.sentry:sentry:7.13.0' + api 'io.sentry:sentry:7.14.0' api 'commons-io:commons-io:2.16.1' api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.17.2" api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.17.2" diff --git a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java index 0ed9470c..95b9041a 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java @@ -117,7 +117,6 @@ public class AppMainWindow { } private void setupListeners() { - AppWindowBounds.fixInvalidStagePosition(stage); stage.xProperty().addListener((c, o, n) -> { if (windowActive.get()) { onChange(); diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowBounds.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowBounds.java index 9b804236..3d425531 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowBounds.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowBounds.java @@ -1,8 +1,6 @@ package io.xpipe.app.core.window; import io.xpipe.app.core.App; -import io.xpipe.core.process.OsType; - import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import javafx.stage.Stage; @@ -10,48 +8,9 @@ import javafx.stage.Stage; import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.concurrent.atomic.AtomicBoolean; public class AppWindowBounds { - public static void fixInvalidStagePosition(Stage stage) { - if (OsType.getLocal() != OsType.LINUX) { - return; - } - - var xSet = new AtomicBoolean(); - stage.xProperty().addListener((observable, oldValue, newValue) -> { - var n = newValue.doubleValue(); - var o = oldValue.doubleValue(); - if (stage.isShowing() && areNumbersValid(o, n)) { - // Ignore rounding events - if (Math.abs(n - o) < 0.5) { - return; - } - - if (!xSet.getAndSet(true) && !stage.isMaximized() && n <= 0.0 && o > 0.0 && Math.abs(n - o) > 100) { - stage.setX(o); - } - } - }); - - var ySet = new AtomicBoolean(); - stage.yProperty().addListener((observable, oldValue, newValue) -> { - var n = newValue.doubleValue(); - var o = oldValue.doubleValue(); - if (stage.isShowing() && areNumbersValid(o, n)) { - // Ignore rounding events - if (Math.abs(n - o) < 0.5) { - return; - } - - if (!ySet.getAndSet(true) && !stage.isMaximized() && n <= 0.0 && o > 0.0 && Math.abs(n - o) > 20) { - stage.setY(o); - } - } - }); - } - public static Stage centerStage() { var stage = new Stage() { @Override diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java index 320a0562..c9ad0b25 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java @@ -75,7 +75,6 @@ public class AppWindowHelper { addIcons(stage); setupContent(stage, contentFunc, bindSize, loading); setupStylesheets(stage.getScene()); - AppWindowBounds.fixInvalidStagePosition(stage); if (AppPrefs.get() != null && AppPrefs.get().enforceWindowModality().get()) { stage.initModality(Modality.WINDOW_MODAL); @@ -143,7 +142,6 @@ public class AppWindowHelper { }); event.consume(); }); - AppWindowBounds.fixInvalidStagePosition(s); a.getDialogPane().getScene().addEventHandler(KeyEvent.KEY_PRESSED, event -> { if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(event)) { s.close(); diff --git a/beacon/build.gradle b/beacon/build.gradle index e6a91292..2e3dcba4 100644 --- a/beacon/build.gradle +++ b/beacon/build.gradle @@ -16,9 +16,9 @@ repositories { } dependencies { - compileOnly 'org.hamcrest:hamcrest:2.2' - compileOnly 'org.junit.jupiter:junit-jupiter-api:5.10.3' - compileOnly 'org.junit.jupiter:junit-jupiter-params:5.10.3' + compileOnly 'org.hamcrest:hamcrest:3.0' + compileOnly 'org.junit.jupiter:junit-jupiter-api:5.11.0' + compileOnly 'org.junit.jupiter:junit-jupiter-params:5.11.0' api project(':core') } diff --git a/dist/licenses/sentry.properties b/dist/licenses/sentry.properties index 638c7b8a..c93baa4b 100644 --- a/dist/licenses/sentry.properties +++ b/dist/licenses/sentry.properties @@ -1,4 +1,4 @@ name=Sentry Java -version=7.13.0 +version=7.14.0 license=MIT License link=https://github.com/getsentry/sentry-java \ No newline at end of file diff --git a/gradle/gradle_scripts/junit.gradle b/gradle/gradle_scripts/junit.gradle index c9583da3..23917431 100644 --- a/gradle/gradle_scripts/junit.gradle +++ b/gradle/gradle_scripts/junit.gradle @@ -1,10 +1,10 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent dependencies { - testImplementation 'org.hamcrest:hamcrest:2.2' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3' + testImplementation 'org.hamcrest:hamcrest:3.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0' testRuntimeOnly "org.junit.platform:junit-platform-launcher" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..2c352119 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dedd5d1e..66cd5a0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/version b/version index c73515d0..cbc5c7d2 100644 --- a/version +++ b/version @@ -1 +1 @@ -11.0-10 +11.0-11