Skip to content

Commit

Permalink
upstep gradle/kotlin/quarkus
Browse files Browse the repository at this point in the history
  • Loading branch information
mouse256 committed Jan 7, 2024
1 parent f8a446e commit 12f4275
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.8.22"
kotlin("plugin.allopen") version "1.8.22"
kotlin("jvm") version "1.9.22"
kotlin("plugin.allopen") version "1.9.22"
id("io.quarkus")
}

Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Gradle properties
#Sun Sep 10 21:10:16 CEST 2023
quarkusPluginVersion=3.2.2.Final
quarkusPluginVersion=3.6.4
quarkusPlatformArtifactId=quarkus-bom
quarkusPluginId=io.quarkus
quarkusPlatformGroupId=io.quarkus.platform
quarkusPlatformVersion=3.2.2.Final
quarkusPlatformVersion=3.6.4
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ 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=SC3045
# 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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# 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 $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_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" \
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/org/acme/Controller.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Controller : ArylicConnection.Callbacks {
}
}

vertx.executeBlocking<Unit> {
vertx.executeBlocking<Unit> {prom ->
try {
val port = cfg.port().orElse(8899)
log.info { "Adding device \"${cfg.ip()}:$port\"" }
Expand All @@ -61,8 +61,10 @@ class Controller : ArylicConnection.Callbacks {
.onFailure { log.warn { "Can't fetch initial device-info" } }
conn.sendCommand(Command.DeviceInfoCmd)
log.info { "Requesting deviceInfo from \"${cfg.ip()}:$port\"" }
prom.complete()
} catch (ex: Exception) {
log.warn { "Unable to connect to device ${cfg.ip()}: ${ex.message}" }
prom.fail(ex)
}
}
}
Expand Down

0 comments on commit 12f4275

Please sign in to comment.