Merge branch 'main' into new-readme-2

This commit is contained in:
Ben Woo 2023-03-27 10:16:41 +08:00 committed by GitHub
commit 346ac94737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions

View File

@ -26,4 +26,11 @@ jobs:
with: with:
arguments: build arguments: build
env: env:
GITHUB_VERSION: pr${{ github.event.pull_request.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Artifact output
uses: actions/upload-artifact@v3
with:
name: multiverse-core-pr${{ github.event.pull_request.number }}
path: build/libs/multiverse-core-pr${{ github.event.pull_request.number }}.jar

View File

@ -15,6 +15,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11
repositories { repositories {
mavenLocal() mavenLocal()
mavenCentral()
maven { maven {
url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/') url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
} }
@ -41,9 +43,7 @@ repositories {
} }
dependencies { dependencies {
implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
exclude group: 'junit', module: 'junit'
}
implementation('com.github.MilkBowl:VaultAPI:1.7') { implementation('com.github.MilkBowl:VaultAPI:1.7') {
exclude group: 'org.bukkit', module: 'bukkit' exclude group: 'org.bukkit', module: 'bukkit'
@ -64,6 +64,10 @@ dependencies {
api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT' api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
api 'org.jetbrains:annotations:16.0.2' api 'org.jetbrains:annotations:16.0.2'
testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
exclude group: 'junit', module: 'junit'
}
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:3.11.2' testImplementation 'org.mockito:mockito-core:3.11.2'
testImplementation 'commons-io:commons-io:2.4' testImplementation 'commons-io:commons-io:2.4'