Skip to content

Commit

Permalink
Maintenance (#87)
Browse files Browse the repository at this point in the history
* Attempt to update deps

* Finish updates, remove verification

* Update CI, add dependabot

* Minecraft: Ignore unknown keys

* Remove unnecessary suppression
  • Loading branch information
gdude2002 committed Mar 8, 2024
1 parent 9b40580 commit ae9d300
Show file tree
Hide file tree
Showing 58 changed files with 99 additions and 4,025 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2
enable-beta-ecosystems: true

updates:
- package-ecosystem: "gradle"
directory: "/"

schedule:
interval: "weekly"

- package-ecosystem: "github-actions"
directory: "/"

schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v1

with:
java-version: 1.16
java-version: 1.17

- name: Gradle (Build)
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-java@v1

with:
java-version: 1.16
java-version: 1.17

- name: Gradle (Build)
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v1

with:
java-version: 1.16
java-version: 1.17

- name: Gradle (Build)
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

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.

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

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

Empty file.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ dependencies {
implementation(libs.kordex.mappings)
implementation(libs.kordex.phishing)
implementation(libs.kordex.pluralkit)
implementation(libs.kordex.tags)
implementation(libs.kordex.unsafe)
implementation(libs.kordex.welcome)

implementation(libs.commons.text)
implementation(libs.homoglyph)
Expand All @@ -91,9 +93,7 @@ dependencies {
implementation(projects.moduleLogParser)
implementation(projects.moduleModeration)
implementation(projects.moduleRoleSync)
implementation(projects.moduleTags)
implementation(projects.moduleUserCleanup)
implementation(projects.moduleWelcome)
}

graphql {
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ dependencies {
implementation(gradleApi())
implementation(localGroovy())

implementation(kotlin("gradle-plugin", version = "1.9.21"))
implementation(kotlin("serialization", version = "1.9.21"))
implementation(kotlin("gradle-plugin", version = "1.9.22"))
implementation(kotlin("serialization", version = "1.9.22"))

implementation("gradle.plugin.org.cadixdev.gradle", "licenser", "0.6.1")
implementation("com.github.jakemarsden", "git-hooks-gradle-plugin", "0.0.2")
implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.9.21-1.0.15")
implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.4")
implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.9.22-1.0.17")
implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.5")
// implementation("org.ec4j.editorconfig", "org.ec4j.editorconfig.gradle.plugin", "0.0.3")

implementation("com.expediagroup.graphql", "com.expediagroup.graphql.gradle.plugin", "6.3.5")
implementation("com.expediagroup.graphql", "com.expediagroup.graphql.gradle.plugin", "7.0.2")
implementation("com.github.johnrengelman.shadow", "com.github.johnrengelman.shadow.gradle.plugin", "8.1.1")
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/cozy-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ tasks {

detekt {
buildUponDefaultConfig = true
config = rootProject.files("detekt.yml")
config.from(rootProject.files("detekt.yml"))
}

// Credit to ZML for this workaround.
Expand Down
32 changes: 17 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[versions]
detekt = "1.23.4"
kotlin = "1.9.21"
graphql = "6.3.5"
detekt = "1.23.5"
kotlin = "1.9.22"
graphql = "7.0.2"

autolink = "0.10.1"
commons-text = "1.10.0"
autolink = "0.11.0"
commons-text = "1.11.0"
excelkt = "1.0.2"
flexver = "1.1.1"
groovy = "3.0.19"
groovy = "3.0.20"
homoglyph = "1.2.1"
jansi = "2.4.1"
jsoup = "1.17.1"
kaml = "0.55.0"
kmongo = "4.8.0"
kordex = "1.7.1-SNAPSHOT"
jsoup = "1.17.2"
kaml = "0.57.0"
kmongo = "4.11.0"
kordex = "1.8.0-SNAPSHOT"
kotlintest = "3.4.2"
ktor = "2.2.4"
kx-ser = "1.6.2"
logback = "1.4.14"
ktor = "2.3.8"
kx-ser = "1.6.3"
logback = "1.5.1"
logback-groovy = "1.14.5"
logging = "5.1.1"
logging = "6.0.3"
moshi = "1.15.0"
rgxgen = "1.4"
rgxgen = "2.0"
semver = "1.4.2"

[libraries]
Expand All @@ -45,6 +45,8 @@ kordex-mappings = { module = "com.kotlindiscord.kord.extensions:extra-mappings",
kordex-phishing = { module = "com.kotlindiscord.kord.extensions:extra-phishing", version.ref = "kordex" }
kordex-pluralkit = { module = "com.kotlindiscord.kord.extensions:extra-pluralkit", version.ref = "kordex" }
kordex-unsafe = { module = "com.kotlindiscord.kord.extensions:unsafe", version.ref = "kordex" }
kordex-tags = { module = "com.kotlindiscord.kord.extensions:extra-tags", version.ref = "kordex" }
kordex-welcome = { module = "com.kotlindiscord.kord.extensions:extra-welcome", version.ref = "kordex" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
27 changes: 0 additions & 27 deletions module-tags/build.gradle.kts

This file was deleted.

Loading

0 comments on commit ae9d300

Please sign in to comment.