Skip to content

Commit

Permalink
Merge branch 'root' into dependabot/gradle/net.time4j-time4j-base-5.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gdude2002 authored Aug 23, 2023
2 parents e4b8751 + 54d9271 commit d3a1bba
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

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

with:
java-version: 1.17
java-version: 17
distribution: temurin

- name: Set up Gradle properties
run: |
Expand All @@ -32,21 +33,21 @@ jobs:
arguments: checkLicenses build

- name: Upload artifact (Extra Module JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

- name: Upload artifact (Main JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

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

with:
name: JARs (Modules)
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

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

with:
java-version: 1.17
java-version: 17
distribution: temurin

- name: Set up Kotlin
uses: fwilhe2/setup-kotlin@main
Expand Down Expand Up @@ -68,21 +69,21 @@ jobs:
arguments: publish --no-parallel

- name: Upload artifact (Extra Module JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

- name: Upload artifact (Main JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

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

with:
name: JARs (Modules)
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

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

with:
java-version: 1.17
java-version: 17
distribution: temurin

- name: Set up Kotlin
uses: fwilhe2/setup-kotlin@main
Expand All @@ -29,7 +30,7 @@ jobs:
echo -e "\nsigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }}" >> ~/.gradle/gradle.properties
- name: Set up git credentials
uses: oleksiyrudenko/gha-git-credentials@v2-latest
uses: oleksiyrudenko/gha-git-credentials@v2

with:
global: true
Expand Down Expand Up @@ -82,21 +83,21 @@ jobs:
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}

- name: Upload artifact (Extra Module JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

- name: Upload artifact (Main JARs)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3

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

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

with:
name: JARs (Modules)
Expand Down
1 change: 0 additions & 1 deletion annotation-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ dependencies {
implementation(libs.kotlin.stdlib)

implementation(libs.koin.core)
implementation(libs.kotlinpoet)
implementation(libs.ksp)

implementation(project(":annotations"))
Expand Down
6 changes: 2 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ koin = "3.4.3"
konf = "1.1.2"
#kord = "0.9.x-SNAPSHOT"
kord = "0.11.0-SNAPSHOT"
kotlinpoet = "1.14.2"
ksp = "1.9.0-1.0.13"
ktor = "2.3.2"
ktor = "2.3.3"
kx-coro = "1.7.3"
kx-ser = "1.5.1"
linkie = "1.0.99"
logback = "1.4.11"
logback-groovy = "1.14.4"
logging = "5.1.0"
mongodb = "4.10.1"
mongodb = "4.10.2"
pf4j = "3.9.0"
sentry = "6.28.0"
slf4j = "2.0.7"
Expand All @@ -49,7 +48,6 @@ konf-toml = { module = "com.uchuhimo:konf-toml", version.ref = "konf" }

kord = { module = "dev.kord:kord-core-voice", version.ref = "kord" }

kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
Expand Down

0 comments on commit d3a1bba

Please sign in to comment.