Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update Spigot and MV-Core #59

Merged
merged 5 commits into from
Jan 14, 2024
Merged

fix: update Spigot and MV-Core #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b09193
fix: update Spigot and MV-Core
Jan 14, 2024
ea8a556
ci: always run CI
Jan 14, 2024
e154bde
ci: update JDK ver
Jan 14, 2024
8bc5408
ci: lock OS ver
Jan 14, 2024
54e0301
refactor: use function literal
Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-build/action.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/test/scala/click/seichi/regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala
View file
Open in desktop
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