Skip to content

Commit

Permalink
Merge branch 'root' into mappings-storage-unit
Browse files Browse the repository at this point in the history
  • Loading branch information
gdude2002 committed Oct 30, 2023
2 parents 3e047a5 + 54d8e2b commit 15aac03
Show file tree
Hide file tree
Showing 59 changed files with 520 additions and 221 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ indent_style = tab
trim_trailing_whitespace = true
max_line_length = 120

[*.yml]
[{*.yml,*.yaml}]
indent_style = space
indent_size = 2
55 changes: 55 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: "CodeQL"

on:
push:
branches:
- root

pull_request:
branches:
- root

schedule:
- cron: '19 21 * * 4'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
timeout-minutes: 360

permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false

matrix:
language: [ java-kotlin ]

steps:
- uses: actions/checkout@v4

- name: Set up Java
uses: actions/setup-java@v3

with:
java-version: 17
distribution: temurin

- name: Initialize CodeQL
uses: github/codeql-action/init@v2

with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2

with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/modules/test-bot/kord-extensions.test-bot.main.iml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/modules/test-bot/kord-extensions.test-bot.test.iml

This file was deleted.

10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/dokka-module.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import java.net.URL
import java.net.URI

plugins {
id("org.jetbrains.dokka")
Expand Down Expand Up @@ -38,21 +38,21 @@ tasks {
localDirectory.set(file("${project.projectDir}/src/main/kotlin"))

remoteUrl.set(
URL(
URI(
"https://github.com/Kotlin-Discord/kord-extensions/" +
"tree/${getCurrentGitBranch()}/${projectDir}/src/main/kotlin"
)
).toURL()
)

remoteLineSuffix.set("#L")
}

externalDocumentationLink {
url.set(URL("http://kordlib.github.io/kord/common/common/"))
url.set(URI("http://kordlib.github.io/kord/common/common/").toURL())
}

externalDocumentationLink {
url.set(URL("http://kordlib.github.io/kord/core/core/"))
url.set(URI("http://kordlib.github.io/kord/core/core/").toURL())
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import com.kotlindiscord.kord.extensions.plugins.extra.MappingsPlugin
import com.kotlindiscord.kord.extensions.sentry.BreadcrumbType
import com.kotlindiscord.kord.extensions.storage.StorageType
import com.kotlindiscord.kord.extensions.storage.StorageUnit
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.entity.Permission
import dev.kord.common.entity.Snowflake
import dev.kord.core.behavior.GuildBehavior
Expand Down Expand Up @@ -1194,7 +1193,8 @@ class MappingsExtension : Extension() {

private suspend fun GuildBehavior.getTimeout() = config().timeout.toLong()

private suspend fun CheckContextWithCache<ChatInputCommandInteractionCreateEvent>.customChecks(
private suspend fun CheckContextWithCache<
>.customChecks(
command: String,
namespace: Namespace,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralMessageCommand
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.event
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.dm
import com.kotlindiscord.kord.extensions.utils.getJumpUrl
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import com.kotlindiscord.kord.extensions.modules.extra.pluralkit.storage.PKGuild
import com.kotlindiscord.kord.extensions.modules.extra.pluralkit.utils.LRUHashMap
import com.kotlindiscord.kord.extensions.storage.StorageType
import com.kotlindiscord.kord.extensions.storage.StorageUnit
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
import com.kotlindiscord.kord.extensions.utils.scheduling.Task
import dev.kord.common.entity.Permission
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ kotlin.incremental = true

ksp.incremental = false

projectVersion = 1.5.10-SNAPSHOT
# Must be updated for Writerside in v.list
projectVersion = 1.6.0-SNAPSHOT

#dokka will run out of memory with the default meta space
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ kotlin = "1.9.10" # Note: Plugin versions must be updated in buildSrc/build.gra
commons-validator = "1.7"
groovy = "3.0.19"
icu4j = "73.2"
jansi = "2.4.0"
jsoup = "1.16.1"
jansi = "2.4.1"
jsoup = "1.16.2"
junit = "5.10.0"
koin = "3.5.0"
konf = "1.1.2"
#kord = "0.9.x-SNAPSHOT"
kord = "0.11.1"
kord = "0.12.0-SNAPSHOT"
#kord = "0.11.1"
ksp = "1.9.10-1.0.13"
ktor = "2.3.4"
ktor = "2.3.5"
kx-coro = "1.7.3"
kx-ser = "1.6.0"
linkie = "1.0.114"
logback = "1.4.11"
logback-groovy = "1.14.5"
logging = "5.1.0"
mongodb = "4.10.2"
mongodb = "4.11.0"
pf4j = "3.10.0"
semver = "1.4.2"
sentry = "6.30.0"
sentry = "6.32.0"
slf4j = "2.0.9"
time4j-base = "5.9.3"
time4j-tzdata = "5.0-2023b"
Expand Down
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.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 15aac03

Please sign in to comment.