Skip to content

Commit

Permalink
Merge pull request Walkyst#19 from lavalink-devs/reformat-everything
Browse files Browse the repository at this point in the history
Reformat everything
  • Loading branch information
nikammerlaan authored Aug 4, 2023
2 parents 5ceec11 + 980a1f6 commit 0bce048
Show file tree
Hide file tree
Showing 414 changed files with 26,608 additions and 26,054 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Reformat code to 4 space indents
9565a0d600a7ab8e302b840b93d2d4e05de7b573
102 changes: 51 additions & 51 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
name: Publish
on:
push:
branches: [ '**' ]
paths-ignore: [ '**.md' ]
workflow_call:
secrets:
MAVEN_USERNAME:
required: false
MAVEN_PASSWORD:
required: false
ORG_GRADLE_PROJECT_mavenCentralPassword:
required: false
ORG_GRADLE_PROJECT_mavenCentralUsername:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKey:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword:
required: false
push:
branches: [ '**' ]
paths-ignore: [ '**.md' ]
workflow_call:
secrets:
MAVEN_USERNAME:
required: false
MAVEN_PASSWORD:
required: false
ORG_GRADLE_PROJECT_mavenCentralPassword:
required: false
ORG_GRADLE_PROJECT_mavenCentralUsername:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKey:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword:
required: false

jobs:
build:
runs-on: ubuntu-latest
env:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
build:
runs-on: ubuntu-latest
env:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
cache: gradle
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
cache: gradle

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Build and Publish
run: ./gradlew build publish --no-daemon -PMAVEN_USERNAME=$MAVEN_USERNAME -PMAVEN_PASSWORD=$MAVEN_PASSWORD
- name: Build and Publish
run: ./gradlew build publish --no-daemon -PMAVEN_USERNAME=$MAVEN_USERNAME -PMAVEN_PASSWORD=$MAVEN_PASSWORD

- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Lavaplayer.zip
path: |
main/build/libs/lavaplayer-*.jar
common/build/libs/lava-common-*.jar
extensions/format-xm/build/libs/lavaplayer-ext-format-xm-*.jar
extensions/youtube-rotator/build/libs/lavaplayer-ext-youtube-rotator-*.jar
natives-publish/build/libs/lavaplayer-natives-*.jar
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: Lavaplayer.zip
path: |
main/build/libs/lavaplayer-*.jar
common/build/libs/lava-common-*.jar
extensions/format-xm/build/libs/lavaplayer-ext-format-xm-*.jar
extensions/youtube-rotator/build/libs/lavaplayer-ext-youtube-rotator-*.jar
natives-publish/build/libs/lavaplayer-natives-*.jar
70 changes: 35 additions & 35 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
name: Release

on:
release:
types: [published]
release:
types: [ published ]

jobs:
build:
uses: ./.github/workflows/build.yml
secrets:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
build:
uses: ./.github/workflows/build.yml
secrets:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}

release:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
release:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Download Artifacts
uses: actions/download-artifact@v3
with:
name: Lavaplayer.zip
- name: Download Artifacts
uses: actions/download-artifact@v3
with:
name: Lavaplayer.zip

- name: Upload Artifacts to GitHub Release
uses: ncipollo/release-action@v1
with:
artifacts: |
main/build/libs/lavaplayer-*.jar
common/build/libs/lava-common-*.jar
extensions/format-xm/build/libs/lavaplayer-ext-format-xm-*.jar
extensions/youtube-rotator/build/libs/lavaplayer-ext-youtube-rotator-*.jar
natives-publish/build/libs/lavaplayer-natives-*.jar
allowUpdates: true
omitBodyDuringUpdate: true
omitDraftDuringUpdate: true
omitNameDuringUpdate: true
omitPrereleaseDuringUpdate: true
- name: Upload Artifacts to GitHub Release
uses: ncipollo/release-action@v1
with:
artifacts: |
main/build/libs/lavaplayer-*.jar
common/build/libs/lava-common-*.jar
extensions/format-xm/build/libs/lavaplayer-ext-format-xm-*.jar
extensions/youtube-rotator/build/libs/lavaplayer-ext-youtube-rotator-*.jar
natives-publish/build/libs/lavaplayer-natives-*.jar
allowUpdates: true
omitBodyDuringUpdate: true
omitDraftDuringUpdate: true
omitNameDuringUpdate: true
omitPrereleaseDuringUpdate: true
Loading

0 comments on commit 0bce048

Please sign in to comment.