Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KordEx v2 #312

Closed
wants to merge 23 commits into from
Closed

KordEx v2 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0c2bf08
Move package, fix file structure, remove plugins experiment
gdude2002 Jul 27, 2024
3672929
Hi detekt!
gdude2002 Jul 27, 2024
033923c
Update gitignore, build folders
gdude2002 Jul 27, 2024
6e78fa1
Move translations to own repo, get from Git
gdude2002 Jul 28, 2024
0a1e3a1
Fix CI workflows, remove OSSRH publishing
gdude2002 Jul 28, 2024
979fc8a
Update Mappings bundle and README
gdude2002 Jul 28, 2024
2126a78
Unsafe buttons, update detekt config
gdude2002 Jul 30, 2024
2671099
Use resolved objects in select menu contexts where possible
gdude2002 Jul 30, 2024
8db9314
Remove deprecated APIs
gdude2002 Jul 30, 2024
6887f51
Add mentionable select menus, and defaults for entity select menus.
gdude2002 Jul 30, 2024
d5dd69a
Add unsafe select menus
gdude2002 Jul 30, 2024
e40b73f
Add Modals to all unsafe components/commands
gdude2002 Jul 30, 2024
b12bdbb
Fix up the plugin system a bit
gdude2002 Jul 31, 2024
0769532
Remove the WiredPlugin annotation and processor
gdude2002 Jul 31, 2024
b799cd2
Implement data collection
gdude2002 Aug 6, 2024
3572071
"About" extension and config, prefix kordex extensions names with kor…
gdude2002 Aug 7, 2024
503d433
Fix some extension names
gdude2002 Aug 7, 2024
3d7c019
Add Kord version to default properties, output on startup
gdude2002 Aug 7, 2024
aa49d50
Remove test no longer needed
gdude2002 Aug 8, 2024
0ea7648
About command sections, sort buttons
gdude2002 Aug 9, 2024
8a71d34
Small fixes, don't get application info on every data collection
gdude2002 Aug 9, 2024
c0cab36
Move mappings module out temporarily
gdude2002 Aug 12, 2024
e1f9a30
Relicence to the EUPL v1.2!
gdude2002 Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 18 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,39 @@ jobs:
mkdir -p ~/.gradle
echo "org.gradle.jvmargs=-XX:MaxMetaspaceSize=5G" >> ~/.gradle/gradle.properties

- name: Gradle (Build)
uses: gradle/gradle-build-action@v3
- name: Gradle (Setup)
uses: gradle/actions/setup-gradle@v3

with:
arguments: checkLicenses build
- name: Gradle (Build)
run: "./gradlew checkLicenses build"

env:
TOKEN: "${{ secrets.TOKEN }}"

- name: Upload artifact (Extra Module JARs)
- name: Upload artifact (Core JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Extra Modules)
path: extra-modules/*/build/libs/*.jar
name: JARs (Core)
path: kord-extensions/build/libs/*.jar

- name: Upload artifact (Main JARs)
- name: Upload artifact (Annotation JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Main)
path: kord-extensions/build/libs/*.jar
name: JARs (Annotation)
path: annotations/**/build/libs/*.jar

- name: Upload artifact (Module JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Modules)
path: modules/*/build/libs/*.jar
path: modules/**/build/libs/*.jar

- name: Upload artifact (Parser JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Parser)
path: token-parser/build/libs/*.jar
39 changes: 20 additions & 19 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ jobs:
echo "githubToken=${{ secrets.GITHUB_TOKEN }}" >> ~/.gradle/gradle.properties
echo -e "\norg.gradle.jvmargs=-XX:MaxMetaspaceSize=5G" >> ~/.gradle/gradle.properties

- name: Gradle (Build)
uses: gradle/gradle-build-action@v3
- name: Gradle (Setup)
uses: gradle/actions/setup-gradle@v3

with:
arguments: checkLicenses build dokkaHtmlMultiModule
dependency-graph: generate-and-submit

- name: Gradle (Build)
run: "./gradlew checkLicenses build dokkaHtmlMultiModule"

env:
TOKEN: ${{ secrets.TOKEN }}

Expand All @@ -57,13 +59,8 @@ jobs:

run: zip -qq -r dokka.zip htmlMultiModule

- name: Disable parallel publish
if: contains(steps.project-version.outputs.version, '-SNAPSHOT')

run: kotlin .github/disable-parallel.main.kts

- name: Gradle (Publish)
uses: gradle/gradle-build-action@v3
run: "./gradlew publish"

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

Expand All @@ -79,29 +76,33 @@ jobs:

TOKEN: "${{ secrets.TOKEN }}"

with:
arguments: publish --no-parallel

- name: Upload artifact (Extra Module JARs)
- name: Upload artifact (Core JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Extra Modules)
path: extra-modules/*/build/libs/*.jar
name: JARs (Core)
path: kord-extensions/build/libs/*.jar

- name: Upload artifact (Main JARs)
- name: Upload artifact (Annotation JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Main)
path: kord-extensions/build/libs/*.jar
name: JARs (Annotation)
path: annotations/**/build/libs/*.jar

- name: Upload artifact (Module JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Modules)
path: modules/*/build/libs/*.jar
path: modules/**/build/libs/*.jar

- name: Upload artifact (Parser JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Parser)
path: token-parser/build/libs/*.jar

- name: Upload artifact (Dokka)
uses: actions/upload-artifact@v4
Expand Down
44 changes: 23 additions & 21 deletions .github/workflows/tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,17 @@ jobs:
global: true
token: '${{ secrets.GITHUB_TOKEN }}'

- name: Gradle (Build)
uses: gradle/gradle-build-action@v3
- name: Gradle (Setup)
uses: gradle/actions/setup-gradle@v3

with:
arguments: checkLicenses build
- name: Gradle (Build)
run: "./gradlew checkLicenses build"

env:
TOKEN: "${{ secrets.TOKEN }}"

- name: Disable parallel publish

run: kotlin .github/disable-parallel.main.kts

- name: Gradle (Publish)
uses: gradle/gradle-build-action@v3
run: "./gradlew publish"

env:
ORG_GRADLE_PROJECT_signingKey: "${{ secrets.GPG_KEY }}"
Expand All @@ -64,9 +60,6 @@ jobs:

TOKEN: "${{ secrets.TOKEN }}"

with:
arguments: publish --no-parallel

- name: Create release description
run: kotlin .github/tag.main.kts

Expand All @@ -85,33 +78,42 @@ jobs:
name: Release ${{ steps.get_tag.outputs.NAME }}

files: |
build/libs/*.jar
**/build/libs/*.jar
annotations/*/build/libs/*.jar
kord-extensions/build/libs/*.jar
modules/**/build/libs/*.jar
token-parser/build/libs/*.jar

- name: Release webhook
run: kotlin .github/release.main.kts

env:
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}

- name: Upload artifact (Extra Module JARs)
- name: Upload artifact (Core JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Extra Modules)
path: extra-modules/*/build/libs/*.jar
name: JARs (Core)
path: kord-extensions/build/libs/*.jar

- name: Upload artifact (Main JARs)
- name: Upload artifact (Annotation JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Main)
path: kord-extensions/build/libs/*.jar
name: JARs (Annotation)
path: annotations/**/build/libs/*.jar

- name: Upload artifact (Module JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Modules)
path: modules/*/build/libs/*.jar
path: modules/**/build/libs/*.jar

- name: Upload artifact (Parser JARs)
uses: actions/upload-artifact@v4

with:
name: JARs (Parser)
path: token-parser/build/libs/*.jar

14 changes: 11 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,20 @@ fabric.properties

### Custom ignores

/data
*/build
*/*/build
/**/build/
/**/build/**

*.hprof
.env
docs/site
.linkie-cache/
.kotlin/
detekt.html
detekt.md
**/detekt.html
**/detekt.md

# Testing Paths
/test-bot/plugins
/config
/data
55 changes: 55 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/copyright/EUPL_v1_2__ROI_.xml
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

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

10 changes: 6 additions & 4 deletions .idea/fileTemplates/JavaFXApplication.java
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions .idea/fileTemplates/internal/AnnotationType.java
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions .idea/fileTemplates/internal/CSS File.css
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions .idea/fileTemplates/internal/Class.java
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions .idea/fileTemplates/internal/Enum.java
View file
Open in desktop

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

Loading
Loading