Merge pull request #26 from GiganticMinecraft/updateScalaVersion

Scalaのバージョンを上げる

build.sbt

@@ -1,6 +1,6 @@
 import ResourceFilter.filterResources
 
-ThisBuild / scalaVersion := "2.13.6"
+ThisBuild / scalaVersion := "2.13.12"
 ThisBuild / version := "0.1.0"
 ThisBuild / description := "A BungeeCord plugin for controlling access to data shared among downstream servers"
 
@@ -30,8 +30,8 @@ val dependenciesToEmbed = Seq(
 )
 
 // treat localDependencies as "provided" and do not shade them in the output Jar
-assemblyExcludedJars in assembly := {
-  (fullClasspath in assembly).value
+assembly / assemblyExcludedJars := {
+  (assembly / fullClasspath).value
     .filter { a =>
       def directoryContainsFile(directory: File, file: File) =
         file.absolutePath.startsWith(directory.absolutePath)
@@ -40,10 +40,10 @@ assemblyExcludedJars in assembly := {
     }
 }
 
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy := {
   case PathList(x) if x.endsWith(".conf") => MergeStrategy.concat
   case x =>
-    val oldStrategy = (assemblyMergeStrategy in assembly).value
+    val oldStrategy = (assembly / assemblyMergeStrategy).value
     oldStrategy(x)
 }
 
@@ -62,20 +62,20 @@ val filesToBeReplacedInResourceFolder = Seq("plugin.yml")
 
 val filteredResourceGenerator = taskKey[Seq[File]]("Resource generator to filter resources")
 
-filteredResourceGenerator in Compile :=
+Compile / filteredResourceGenerator :=
   filterResources(
     filesToBeReplacedInResourceFolder,
     tokenReplacementMap.value,
-    (resourceManaged in Compile).value, (resourceDirectory in Compile).value
+    (Compile / resourceManaged).value, (Compile / resourceDirectory).value
   )
 
-resourceGenerators in Compile += (filteredResourceGenerator in Compile)
+Compile / resourceGenerators += (Compile / filteredResourceGenerator)
 
-unmanagedResources in Compile += baseDirectory.value / "LICENSE"
+Compile / unmanagedResources += baseDirectory.value / "LICENSE"
 
 // exclude replaced files from copying of unmanagedResources
-excludeFilter in unmanagedResources :=
-  filesToBeReplacedInResourceFolder.foldLeft((excludeFilter in unmanagedResources).value)(_.||(_))
+unmanagedResources / excludeFilter :=
+  filesToBeReplacedInResourceFolder.foldLeft((unmanagedResources / excludeFilter).value)(_.||(_))
 
 //endregion
 
@@ -84,7 +84,7 @@ addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVers
 lazy val root = (project in file("."))
   .settings(
     name := "BungeeSemaphore",
-    assemblyOutputPath in assembly := baseDirectory.value / "target" / "build" / "BungeeSemaphore.jar",
+    assembly / assemblyOutputPath := baseDirectory.value / "target" / "build" / "BungeeSemaphore.jar",
     libraryDependencies := providedDependencies ++ testDependencies ++ dependenciesToEmbed,
     unmanagedBase := baseDirectory.value / "localDependencies",
     unmanagedBase := baseDirectory.value / "localDependencies",

src/main/scala/click/seichi/bungeesemaphore/application/HasGlobalPlayerDataSaveLock.scala

@@ -1,12 +1,11 @@
 package click.seichi.bungeesemaphore.application
 
 import click.seichi.bungeesemaphore.domain.PlayerName
-import simulacrum.typeclass
 
 /**
  * A typeclass for specifying that there is a cluster-synchronized data-save lock available.
  */
-@typeclass trait HasGlobalPlayerDataSaveLock[F[_]] {
+trait HasGlobalPlayerDataSaveLock[F[_]] {
   def lock(playerName: PlayerName): F[Unit]
 
   /**
@@ -16,4 +15,8 @@ import simulacrum.typeclass
    *  - When it is found that data save has failed.
    */
   def awaitLockAvailability(playerName: PlayerName): F[Unit]
-}
+}
+
+object HasGlobalPlayerDataSaveLock {
+  def apply[F[_]](implicit ev: HasGlobalPlayerDataSaveLock[F]): HasGlobalPlayerDataSaveLock[F] = ev
+}

src/main/scala/click/seichi/bungeesemaphore/application/HasPlayerConnectionLock.scala

@@ -6,7 +6,7 @@ import simulacrum.typeclass
 /**
  * A typeclass for specifying that there is a machine-local lock synchronized to player's connection
  */
-@typeclass trait HasPlayerConnectionLock[F[_]] {
+trait HasPlayerConnectionLock[F[_]] {
   /**
    * An action to semantically block until the player with given `playerName` disconnects from the proxy server.
    *
@@ -16,3 +16,7 @@ import simulacrum.typeclass
    */
   def awaitDisconnectedState(playerName: PlayerName): F[Unit]
 }
+
+object HasPlayerConnectionLock {
+  def apply[F[_]](implicit ev: HasPlayerConnectionLock[F]): HasPlayerConnectionLock[F] = ev
+}