Skip to content

Commit

Permalink
Merge branch 'main' into new-readme-2
Browse files Browse the repository at this point in the history
  • Loading branch information
benwoo1110 authored Mar 27, 2023
2 parents 6d35130 + 8a69d6a commit 346ac94
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,11 @@ jobs:
with:
arguments: build
env:
GITHUB_VERSION: pr${{ github.event.pull_request.number }}
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
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11

repositories {
mavenLocal()
mavenCentral()

maven {
url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
}
Expand All @@ -41,9 +43,7 @@ repositories {
}

dependencies {
implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
exclude group: 'junit', module: 'junit'
}
compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'

implementation('com.github.MilkBowl:VaultAPI:1.7') {
exclude group: 'org.bukkit', module: 'bukkit'
Expand All @@ -64,6 +64,10 @@ dependencies {
api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
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 'org.mockito:mockito-core:3.11.2'
testImplementation 'commons-io:commons-io:2.4'
Expand Down

0 comments on commit 346ac94

Please sign in to comment.