Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

Commit

Permalink
Update to latest dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
NoComment1105 committed Mar 8, 2024
1 parent e2bf138 commit bd35ba7
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 29 deletions.
4 changes: 4 additions & 0 deletions api/discord-moderation-actions.api
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ public final class org/hyacinthbots/discordmoderationactions/enums/ActionResults
public static final field ACTION_FAIL Lorg/hyacinthbots/discordmoderationactions/enums/ActionResults;
public static final field ACTION_SUCCESS Lorg/hyacinthbots/discordmoderationactions/enums/ActionResults;
public static final field NULL_GUILD Lorg/hyacinthbots/discordmoderationactions/enums/ActionResults;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public final fun getMessage ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/hyacinthbots/discordmoderationactions/enums/ActionResults;
public static fun values ()[Lorg/hyacinthbots/discordmoderationactions/enums/ActionResults;
Expand All @@ -247,6 +248,7 @@ public final class org/hyacinthbots/discordmoderationactions/enums/DmResult : ja
public static final field DM_FAIL Lorg/hyacinthbots/discordmoderationactions/enums/DmResult;
public static final field DM_NOT_SENT Lorg/hyacinthbots/discordmoderationactions/enums/DmResult;
public static final field DM_SUCCESS Lorg/hyacinthbots/discordmoderationactions/enums/DmResult;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public final fun getMessage ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/hyacinthbots/discordmoderationactions/enums/DmResult;
public static fun values ()[Lorg/hyacinthbots/discordmoderationactions/enums/DmResult;
Expand All @@ -256,6 +258,7 @@ public final class org/hyacinthbots/discordmoderationactions/enums/PrivateLogRes
public static final field LOG_FAIL Lorg/hyacinthbots/discordmoderationactions/enums/PrivateLogResult;
public static final field LOG_NOT_SENT Lorg/hyacinthbots/discordmoderationactions/enums/PrivateLogResult;
public static final field LOG_SUCCESS Lorg/hyacinthbots/discordmoderationactions/enums/PrivateLogResult;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public final fun getMessage ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/hyacinthbots/discordmoderationactions/enums/PrivateLogResult;
public static fun values ()[Lorg/hyacinthbots/discordmoderationactions/enums/PrivateLogResult;
Expand All @@ -265,6 +268,7 @@ public final class org/hyacinthbots/discordmoderationactions/enums/PublicLogResu
public static final field PUBLIC_LOG_FAIL Lorg/hyacinthbots/discordmoderationactions/enums/PublicLogResult;
public static final field PUBLIC_LOG_NOT_SENT Lorg/hyacinthbots/discordmoderationactions/enums/PublicLogResult;
public static final field PUBLIC_LOG_SUCCESS Lorg/hyacinthbots/discordmoderationactions/enums/PublicLogResult;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public final fun getMessage ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lorg/hyacinthbots/discordmoderationactions/enums/PublicLogResult;
public static fun values ()[Lorg/hyacinthbots/discordmoderationactions/enums/PublicLogResult;
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

object Meta {
const val projectVersion = "0.2.1"
const val projectVersion = "0.2.2"
const val description =
"Create moderation actions with ease, reduce code duplication and making things easy in KordEx discord bots"
const val githubRepo = "HyacinthBots/discord-moderation-actions"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +131,29 @@ 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.
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" && ! "$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 @@ -198,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
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,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

Expand All @@ -57,11 +57,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

Expand Down
14 changes: 7 additions & 7 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
kotlin = "1.8.22"
kordex = "1.5.8-20230618.092018-1"
kotlin = "1.9.22"
kordex = "1.8.0-20240228.171743-12"

detekt = "1.23.0"
logging = "3.0.5"
logback = "1.4.7"
detekt = "1.23.5"
logging = "6.0.3"
logback = "1.5.0"

git-hooks = "0.0.2"
licenser = "0.6.1"
bin-compat = "0.13.2"
bin-compat = "0.14.0"

[libraries]
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
kordex = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kordex" }
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
logging = { module = "io.github.microutils:kotlin-logging", version.ref = "logging" }
logging = { module = "io.github.oshai:kotlin-logging", version.ref = "logging" }

[plugins]
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ internal suspend inline fun SlashCommandContext<*, *, *>.sendDm(
).getMemberOrNull(targetUserId)
val dm = if (member != null) {
event.kord.getUser(targetUserId)?.dm {
embeds.add(EmbedBuilder().applyBuilder(dmEmbedBuilder))
embeds?.add(EmbedBuilder().applyBuilder(dmEmbedBuilder))
}
} else {
null
Expand Down

0 comments on commit bd35ba7

Please sign in to comment.