diff --git a/snapo-desktop-compose/build.gradle.kts b/snapo-desktop-compose/build.gradle.kts index faf93d9..7eecb7f 100644 --- a/snapo-desktop-compose/build.gradle.kts +++ b/snapo-desktop-compose/build.gradle.kts @@ -22,9 +22,6 @@ repositories { } kotlin { - // Compose Desktop is happiest on a modern JDK; toolchains let Gradle provision one even if the - // user has an older `java` on PATH. - jvmToolchain(17) sourceSets { named("main") { kotlin.srcDir(layout.buildDirectory.dir("generated/version")) @@ -32,12 +29,6 @@ kotlin { } } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} - data class VersionInfo( val version: String, val buildNumber: String, @@ -101,8 +92,16 @@ val generateBuildInfo by tasks.registering { } } -val java17Launcher = javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(17)) +val releaseDistributionTasks = setOf( + "createReleaseDistributable", + "runReleaseDistributable", + "packageReleaseDistributionForCurrentOS", + "packageReleaseDmg", + "packageReleaseUberJarForCurrentOS", + "notarizeReleaseDmg", +) +val isReleaseDistribution = gradle.startParameter.taskNames.any { taskName -> + releaseDistributionTasks.contains(taskName.substringAfterLast(":")) } tasks.withType().configureEach { @@ -168,9 +167,6 @@ tasks.withType().configureEach { compose.desktop { application { - // Compose Desktop packaging uses tools like `jpackage` which are not available in older JDKs. - // The Gradle daemon might still run on an older JDK, so explicitly point Compose to JDK 17. - javaHome = java17Launcher.get().metadata.installationPath.asFile.absolutePath mainClass = "com.openai.snapo.desktop.MainKt" jvmArgs("-Dapple.awt.application.appearance=system") @@ -184,8 +180,10 @@ compose.desktop { packageVersion = resolvedPackageVersion macOS { iconFile.set(project.file("src/main/resources/icons/network.icns")) - entitlementsFile.set(project.file("macos/NetworkInspector.entitlements")) - runtimeEntitlementsFile.set(project.file("macos/NetworkInspector.entitlements")) + if (isReleaseDistribution) { + entitlementsFile.set(project.file("macos/NetworkInspector.entitlements")) + runtimeEntitlementsFile.set(project.file("macos/NetworkInspector.entitlements")) + } } } diff --git a/snapo-desktop-compose/gradle.properties b/snapo-desktop-compose/gradle.properties index 76e541e..ec49d2b 100644 --- a/snapo-desktop-compose/gradle.properties +++ b/snapo-desktop-compose/gradle.properties @@ -2,8 +2,4 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.caching=true -# Ensure Gradle can provision the requested toolchain JDK automatically. -org.gradle.java.installations.auto-download=true - kotlin.code.style=official - diff --git a/snapo-desktop-compose/gradle/libs.versions.toml b/snapo-desktop-compose/gradle/libs.versions.toml index 3295cf2..676430d 100644 --- a/snapo-desktop-compose/gradle/libs.versions.toml +++ b/snapo-desktop-compose/gradle/libs.versions.toml @@ -1,75 +1,29 @@ [versions] -agp = "8.13.2" -detektGradlePlugin = "1.23.8" detektComposeRules = "0.4.23" -gradle = "8.13.2" kotlin = "2.3.0" metro = "0.9.3" -composeMultiplatform = "1.10.0-rc02" +composeMultiplatform = "1.10.0" composeMaterial3 = "1.10.0-alpha05" -composeMaterial3Adaptive = "1.3.0-alpha02" composeHotReload = "1.1.0-alpha03" -jetbrainsLifecycle = "2.10.0-alpha06" -jetbrainsNavigation = "2.9.1" -jetbrainsNavigation3 = "1.0.0-alpha06" -jetbrainsNavigationEvent = "1.0.0-rc02" -jetbrainsSavedstate = "1.4.0" -jetbrainsWindowCore = "1.5.1" coroutines = "1.10.2" -kotlinGradlePlugin = "2.2.20" serialization = "1.9.0" -coreKtx = "1.17.0" -lifecycleRuntimeKtx = "2.10.0" -activityCompose = "1.12.2" -composeBom = "2025.12.01" -okhttpBom = "5.3.2" -ktor = "3.3.3" detekt = "1.23.8" [libraries] -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" } detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektComposeRules" } -gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } -kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } -androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } compose-material3 = { group = "org.jetbrains.compose.material3", name = "material3", version.ref = "composeMaterial3" } -compose-material3-adaptive = { group = "org.jetbrains.compose.material3.adaptive", name = "adaptive", version.ref = "composeMaterial3Adaptive" } compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "composeMultiplatform" } compose-components-splitpane = { group = "org.jetbrains.compose.components", name = "components-splitpane", version.ref = "composeMultiplatform" } compose-ui-tooling-preview = { group = "org.jetbrains.compose.ui", name = "ui-tooling-preview", version.ref = "composeMultiplatform" } -jetbrains-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "jetbrainsLifecycle" } -jetbrains-navigation-compose = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version.ref = "jetbrainsNavigation" } -jetbrains-navigation3-runtime = { group = "org.jetbrains.androidx.navigation3", name = "navigation3-runtime", version.ref = "jetbrainsNavigation3" } -jetbrains-navigationevent-compose = { group = "org.jetbrains.androidx.navigationevent", name = "navigationevent-compose", version.ref = "jetbrainsNavigationEvent" } -jetbrains-savedstate-compose = { group = "org.jetbrains.androidx.savedstate", name = "savedstate-compose", version.ref = "jetbrainsSavedstate" } -jetbrains-window-core = { group = "org.jetbrains.androidx.window", name = "window-core", version.ref = "jetbrainsWindowCore" } -okhttp3-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref = "okhttpBom" } -okhttp3-coroutines = { group = "com.squareup.okhttp3", name = "okhttp-coroutines" } -okhttp3-okhttp = { group = "com.squareup.okhttp3", name = "okhttp" } -ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } -ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" } -ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" } [plugins] -android-application = { id = "com.android.application", version.ref = "agp" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -android-library = { id = "com.android.library", version.ref = "agp" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } metro = { id = "dev.zacsweers.metro", version.ref = "metro" } -projectAccessors = "co.hinge.gradle.project-accessors:1.2.0" diff --git a/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.jar b/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.jar index e708b1c..1b33c55 100644 Binary files a/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.jar and b/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.jar differ diff --git a/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.properties b/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.properties index 94d44f4..2dcec85 100644 --- a/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.properties +++ b/snapo-desktop-compose/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Wed Sep 24 11:05:57 EDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/snapo-desktop-compose/gradlew b/snapo-desktop-compose/gradlew index 4f906e0..23d15a9 100755 --- a/snapo-desktop-compose/gradlew +++ b/snapo-desktop-compose/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,115 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# 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\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/snapo-desktop-compose/gradlew.bat b/snapo-desktop-compose/gradlew.bat index ac1b06f..5eed7ee 100644 --- a/snapo-desktop-compose/gradlew.bat +++ b/snapo-desktop-compose/gradlew.bat @@ -13,8 +13,10 @@ @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 +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +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 @@ -56,32 +59,34 @@ 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 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/snapo-desktop-compose/settings.gradle.kts b/snapo-desktop-compose/settings.gradle.kts index 34ba7e5..6701d44 100644 --- a/snapo-desktop-compose/settings.gradle.kts +++ b/snapo-desktop-compose/settings.gradle.kts @@ -1,5 +1 @@ -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" -} - rootProject.name = "snapo-desktop-compose" diff --git a/snapo-desktop-compose/src/main/resources/icons/network.icns b/snapo-desktop-compose/src/main/resources/icons/network.icns index 7efb610..8f5523c 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.icns and b/snapo-desktop-compose/src/main/resources/icons/network.icns differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128.png index 55cbc7d..9b574e7 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128@2x.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128@2x.png index 1d0965a..56c673a 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128@2x.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_128x128@2x.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16.png index f854375..a54f316 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16@2x.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16@2x.png index 43190fc..8c171bb 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16@2x.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_16x16@2x.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256.png index 1d0965a..56c673a 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256@2x.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256@2x.png index 1901df6..26e1828 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256@2x.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_256x256@2x.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32.png index 43190fc..8c171bb 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32@2x.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32@2x.png index 275f44a..3a42c87 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32@2x.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_32x32@2x.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512.png index 1901df6..26e1828 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512.png differ diff --git a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512@2x.png b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512@2x.png index f31d740..cf2a17d 100644 Binary files a/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512@2x.png and b/snapo-desktop-compose/src/main/resources/icons/network.iconset/icon_512x512@2x.png differ