Skip to content

Commit

Permalink
Merge pull request #59 from GiganticMinecraft/update-1.18
Browse files Browse the repository at this point in the history
fix: update Spigot and MV-Core
  • Loading branch information
Lucky authored Jan 14, 2024
2 parents eec0af2 + 54e0301 commit a69d3fc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
java-version: 17
- name: Prepare build dependencies cache
uses: actions/cache@v3
env:
Expand Down
22 changes: 6 additions & 16 deletions .github/workflows/ci-and-cd.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
name: CI and CD
on:
push:
paths:
- src/**
- build.sbt
- .scalafix.conf
- .scalafmt.conf
- project/*
- .github/**
branches:
- main
pull_request:
paths:
- src/**
- build.sbt
- .scalafix.conf
- .scalafmt.conf
- project/*
- .github/**
branches:
- main

jobs:
ci:
name: Build, Lint and Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -39,7 +29,7 @@ jobs:
run: rm -r target/build
cd:
name: Release
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: ci
if: github.ref == 'refs/heads/main'
# softprops/action-gh-release requires this permisson
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import sbt.Keys.baseDirectory
resolvers ++= Seq(
"maven.elmakers.com" at "https://maven.elmakers.com/repository/", // spigot
"Sonatype OSS" at "https://s01.oss.sonatype.org/content/groups/public/",
"Multiverse" at "https://repo.onarandombox.com/content/repositories/multiverse/"
"Multiverse" at "https://repo.onarandombox.com/content/groups/public/"
)

val providedDependencies = Seq(
"org.spigotmc" % "spigot-api" % "1.12.2-R0.1-SNAPSHOT",
"com.onarandombox.multiversecore" % "Multiverse-Core" % "2.5.0"
"org.spigotmc" % "spigot-api" % "1.18.2-R0.1-SNAPSHOT",
"com.onarandombox.multiversecore" % "Multiverse-Core" % "4.3.0"
).map(_ % "provided")

val embeddedDependencies = Seq("com.beachape" %% "enumeratum" % "1.7.3")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class GenerationScheduleUseCaseSpec extends AnyFlatSpec with Diagrams with MockF
val interval = defaultSchedule.interval
val seedPattern = defaultSchedule.seedPattern
val worlds = defaultSchedule.worlds
(mockClock.now _).expects().returning(now).once()
(() => mockClock.now).expects().returning(now).once()
(mockRepo.save _)
.expects(where { schedule: GenerationSchedule =>
schedule.nextDateTime == now.plus(
Expand Down

0 comments on commit a69d3fc

Please sign in to comment.