Skip to content

Commit 9d52216

Browse files
committed
feat: Remove the dependency to enumeratum
1 parent 626126a commit 9d52216

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import Dependencies._
33
def crossScalacOptions(scalaVersion: String): Seq[String] = CrossVersion.partialVersion(scalaVersion) match {
44
case Some((3L, _)) =>
55
Seq(
6-
"-source:3.0-migration"
6+
"-source:3.0-migration",
7+
"-Xignore-scala2-macros"
78
)
89
case Some((2L, scalaMajor)) if scalaMajor >= 12 =>
910
Seq(
@@ -28,7 +29,7 @@ lazy val baseSettings = Seq(
2829
url = url("https://blog.j5ik2o.me")
2930
)
3031
),
31-
scalaVersion := Versions.scala212Version,
32+
scalaVersion := Versions.scala3Version,
3233
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version, Versions.scala3Version),
3334
scalacOptions ++= (Seq(
3435
"-unchecked",
@@ -78,7 +79,6 @@ val `docker-controller-scala-core` = (project in file("docker-controller-scala-c
7879
freemarker.freemarker,
7980
logback.classic % Test,
8081
commons.io,
81-
beachape.enumeratum.cross(CrossVersion.for3Use2_13)
8282
),
8383
libraryDependencies ++= {
8484
CrossVersion.partialVersion(scalaVersion.value) match {

docker-controller-scala-localstack/src/main/scala/com/github/j5ik2o/dockerController/localstack/LocalStackController.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package com.github.j5ik2o.dockerController.localstack
33
import com.github.dockerjava.api.DockerClient
44
import com.github.dockerjava.api.command.CreateContainerCmd
55
import com.github.dockerjava.api.model.HostConfig.newHostConfig
6-
import com.github.dockerjava.api.model.{ ExposedPort, Ports }
6+
import com.github.dockerjava.api.model.{ExposedPort, Ports}
77
import com.github.j5ik2o.dockerController.DockerControllerImpl
88
import com.github.j5ik2o.dockerController.localstack.LocalStackController._
9-
import enumeratum._
109

1110
import scala.collection.immutable
12-
import scala.concurrent.duration.{ DurationInt, FiniteDuration }
11+
import scala.concurrent.duration.{DurationInt, FiniteDuration}
1312

1413
object LocalStackController {
1514
final val DefaultImageName = "localstack/localstack"
@@ -37,10 +36,9 @@ object LocalStackController {
3736
)
3837
}
3938

40-
sealed abstract class Service(override val entryName: String, val port: Int) extends EnumEntry
39+
sealed abstract class Service(val entryName: String, val port: Int)
4140

42-
object Service extends Enum[Service] {
43-
override def values: immutable.IndexedSeq[Service] = findValues
41+
object Service {
4442
case object ApiGateway extends Service("apigateway", 4567)
4543
case object DynamoDB extends Service("dynamodb", 4569)
4644
case object DynamoDBStreams extends Service("dynamodbstreams", 4570)

0 commit comments

Comments
 (0)