Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ybw0014 committed Jan 14, 2024
1 parent eca8ae2 commit ff9e2af
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 24 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected]
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Validate Gradle wrapper
uses: gradle/[email protected]

- name: Build with Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.11.1
with:
arguments: build

- name: Get build artifact ready
run: mkdir staging && cp build/libs/*.jar staging

- name: Upload a Build Artifact
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4
with:
name: dev-build
path: staging
27 changes: 13 additions & 14 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
name: Sonarcloud
name: SonarCloud
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
branches:
- main
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
name: Build and analyze
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected]
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
distribution: 'temurin'
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew build sonarqube --info
run: ./gradlew build sonar --info
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repositories {
}

dependencies {
implementation 'net.guizhanss:GuizhanLib-api:1.6.1'
implementation 'net.guizhanss:GuizhanLib-api:1.7.0'
implementation 'dev.sefiraat:SefiLib:0.2.6'
implementation 'org.bstats:bstats-bukkit:3.0.2'

Expand Down Expand Up @@ -53,11 +53,11 @@ processResources {
}
}

sonarqube {
sonar {
properties {
property 'sonar.host.url', 'https://sonarcloud.io'
property 'sonar.organization', 'slimefunguguproject'
property 'sonar.projectKey', 'SlimefunGuguProject_Bump'
property "sonar.projectKey", "SlimefunGuguProject_Bump"
property "sonar.organization", "slimefunguguproject"
property "sonar.host.url", "https://sonarcloud.io"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,6 @@ public String getWikiURL() {
}

private boolean isSCSlimefun(@Nonnull String sfVersion) {
return sfVersion.endsWith("-canary") || sfVersion.endsWith("-release");
return sfVersion.endsWith("-canary") || sfVersion.endsWith("-release") || sfVersion.endsWith("-Beta") || sfVersion.endsWith("-Insider");
}
}

0 comments on commit ff9e2af

Please sign in to comment.