Skip to content

Commit

Permalink
Need to test the new build process
Browse files Browse the repository at this point in the history
  • Loading branch information
gdude2002 committed Mar 25, 2023
1 parent 9e3f3ce commit 4db91f7
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 12 deletions.
10 changes: 10 additions & 0 deletions .github/get-version.main.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import java.io.File
import java.util.Properties

val properties = Properties()

properties.load(
File("gradle.properties").inputStream()
)

print(properties["projectVersion"])
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches-ignore:
- "gh-pages"
- "root"

pull_request:

Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Publish
on:
push:
branches:
- "develop"
- "forums"
- "root"

jobs:
publish:
Expand All @@ -19,6 +18,15 @@ jobs:
with:
java-version: 1.14

- name: Set up Kotlin
uses: fwilhe2/setup-kotlin@main

- name: Get version
id: project-version

run: |
echo "version=$(kotlin .github/get-version.main.kts)" >> $GITHUB_OUTPUT
- name: Set up Gradle properties

run: |
Expand All @@ -28,12 +36,15 @@ jobs:
- name: Gradle (Build)
uses: gradle/gradle-build-action@v2

with:
arguments: checkLicenses build

- name: Gradle (Publish)
uses: gradle/gradle-build-action@v2

if: contains(steps.project-version.outputs.version, '-SNAPSHOT')

env:
ORG_GRADLE_PROJECT_signingKey: "${{ secrets.GPG_KEY }}"
ORG_GRADLE_PROJECT_signingPassword: "${{ secrets.GPG_PASSWORD }}"
Expand Down Expand Up @@ -64,4 +75,3 @@ jobs:
with:
name: JARs (Modules)
path: modules/*/build/libs/*.jar

41 changes: 41 additions & 0 deletions changes/1.5.6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# KordEx 1.5.6

This release targets Kord `0.8.0`, the latest stable release for Kord. It's been over a year since the previous stable
Kord release, so it's also been a year since the previous stable KordEx release. How time flies, right?

Please note that as of this release, the `develop` branch is going away. Please reparent your PRs to target the `root`
branch.

**A note about Maven repos:**

Please be aware that as of this release, KordEx is now being deployed to these Maven servers:

* **Releases:** Maven Central
* **Snapshots:** Sonatype Snapshots (`https://s01.oss.sonatype.org/content/repositories/snapshots`)

KordEx releases will no longer be published to the Kotlin Discord maven repo.

**Highlights of this release:**

* We now use Kotlin 1.8.0, and you should too
* Support for Modal forms has been added, which function similarly to argument classes, and can be provided to your
commands and components in the same way - [see here for an example](https://github.com/Kord-Extensions/kord-extensions/blob/root/test-bot/src/main/kotlin/com/kotlindiscord/kord/extensions/testbot/extensions/ModalTestExtension.kt)
* KordEx is now capable of intercepting unknown Kord events and submitting its own events in their place - initially,
this just includes the experimental member screening events available on a handful of servers, but PRs will be
accepted for other event types that Kord doesn't plan on supporting
* A data adapter and storage unit system has been added, allowing extensions to more easily store data, with the
ability for individual bots to define how that data should be stored - note, however, that this is an early version
of that system, and it will likely be changed significantly later
* A module, `extra-pluralkit`, has been created to make things easier for bots that wish to support PluralKit, a very
common accessibility tool on Discord that's mainly used by plural systems
* Additional checks have been added that allow you to test for NSFW channels and guild NSFW levels, among other things
* A cache map object with an extra typed API has been added, allowing you to cache data between checks and make use
of it in the body of your commands, as well as cache data between task runs and provide extra event context for
Kord events
* Commands were given their own translation bundles, which fall back to their extension's if missing
* Slash commands may be fully localized
* Many misc utils have been added, and fixes and additions have been made for existing utils
* Individual converts have been updated with new features and fixes
* The test bot has been moved to its own module, which makes it easier to look over and modify

As always, if you run into any problems, please let us know!
2 changes: 0 additions & 2 deletions kord-extensions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ metadata {
}

dependencies {
api(libs.h2)
api(libs.hikari)
api(libs.icu4j) // For translations
api(libs.koin.core)
api(libs.koin.logger)
Expand Down
9 changes: 2 additions & 7 deletions libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ kotlin = "1.8.0" # Note: Plugin versions must be updated in buildSrc/build.grad

commons-validator = "1.7"
groovy = "3.0.14"
h2 = "2.1.214"
hikari = "5.0.1"
icu4j = "72.1"
jansi = "2.4.0"
jsoup = "1.15.3"
junit = "5.9.1"
koin = "3.3.0"
konf = "1.1.2"
#kord = "forums-SNAPSHOT"
kord = "0.8.x-SNAPSHOT"
#kord = "0.8.0-M14"
#kord = "0.8.x-SNAPSHOT"
kord = "0.8.0"
kotlinpoet = "1.12.0"
ksp = "1.8.0-1.0.8"
ktor = "2.2.2"
Expand All @@ -34,8 +31,6 @@ commons-validator = { module = "commons-validator:commons-validator", version.re
detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }
groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
h2 = { module = "com.h2database:h2", version.ref = "h2" }
hikari = { module = "com.zaxxer:HikariCP", version.ref = "hikari" }
icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4j" }
jansi = { module = "org.fusesource.jansi:jansi", version.ref = "jansi" }
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
Expand Down

0 comments on commit 4db91f7

Please sign in to comment.