From 0b091935dbf90730bfbcce580e248f870c6f6c2e Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sun, 14 Jan 2024 15:08:21 +0900 Subject: [PATCH 1/5] fix: update Spigot and MV-Core --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ba7f5db..e9817ac 100644 --- a/build.sbt +++ b/build.sbt @@ -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") From ea8a556dc655ebf003f641b3f8bfae6f0e398b2d Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sun, 14 Jan 2024 15:10:20 +0900 Subject: [PATCH 2/5] ci: always run CI --- .github/workflows/ci-and-cd.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-and-cd.yml b/.github/workflows/ci-and-cd.yml index bdaf415..17e74b2 100644 --- a/.github/workflows/ci-and-cd.yml +++ b/.github/workflows/ci-and-cd.yml @@ -1,21 +1,11 @@ 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: From e154bde4bdc3a2ce9b72bd2f0dceaa87e074a1fc Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sun, 14 Jan 2024 15:11:00 +0900 Subject: [PATCH 3/5] ci: update JDK ver --- .github/actions/setup-build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index 0c64bff..ae2b5f3 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -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: From 8bc54086c21d8965a0e45c89c12b86f1d2ca06f0 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sun, 14 Jan 2024 15:12:39 +0900 Subject: [PATCH 4/5] ci: lock OS ver --- .github/workflows/ci-and-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-and-cd.yml b/.github/workflows/ci-and-cd.yml index 17e74b2..a0870bd 100644 --- a/.github/workflows/ci-and-cd.yml +++ b/.github/workflows/ci-and-cd.yml @@ -10,7 +10,7 @@ on: jobs: ci: name: Build, Lint and Test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: @@ -29,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 From 54e030195818819c19a5b924992850cd8217c8a6 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sun, 14 Jan 2024 15:13:20 +0900 Subject: [PATCH 5/5] refactor: use function literal --- .../regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/click/seichi/regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala b/src/test/scala/click/seichi/regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala index db1827d..f13dc4b 100644 --- a/src/test/scala/click/seichi/regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala +++ b/src/test/scala/click/seichi/regenerateworld/usecase/GenerationScheduleUseCaseSpec.scala @@ -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(