Skip to content

Commit db75a72

Browse files
committed
Remove implicit and update build
1 parent 76da983 commit db75a72

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

build.sbt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ val scala211 = "2.11.12"
3434
val scala212 = "2.12.8"
3535
val scala213 = "2.13.0"
3636
val dotty = "0.18.1-RC1"
37-
ThisBuild / crossScalaVersions := Seq(scala211, scala212, scala213, dotty)
37+
38+
val versionsBase = Seq(scala211, scala212, scala213)
39+
val versionsJVM = versionsBase :+ dotty
40+
val versionsJS = versionsBase
41+
val versionsNative = Seq(scala211)
42+
43+
ThisBuild / crossScalaVersions := versionsJVM
3844

3945
inThisBuild(
4046
List(
@@ -118,7 +124,7 @@ lazy val sconfig = crossProject(JVMPlatform, NativePlatform, JSPlatform)
118124
mimaBinaryIssueFilters ++= ignoredABIProblems
119125
)
120126
.nativeSettings(
121-
crossScalaVersions := List(scala211),
127+
crossScalaVersions := versionsNative,
122128
scalaVersion := scala211, // allows to compile if scalaVersion set not 2.11
123129
sharedJvmNativeSource,
124130
nativeLinkStubs := true,
@@ -127,6 +133,7 @@ lazy val sconfig = crossProject(JVMPlatform, NativePlatform, JSPlatform)
127133
testFrameworks += new TestFramework("minitest.runner.Framework")
128134
)
129135
.jsSettings(
136+
crossScalaVersions := versionsJS,
130137
libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "0.2.5"
131138
)
132139

sconfig/jvm/src/main/scala/org/ekrich/config/impl/ConfigBeanImpl.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,11 @@ object ConfigBeanImpl {
149149
// setting. So, instead, we only support a limited number of
150150
// types plus you can always use Object, ConfigValue, Config,
151151
// ConfigObject, etc. as an escape hatch.
152-
private def getValue[T <: jl.Enum[T]](
153-
beanClass: Class[_],
154-
parameterType: Type,
155-
parameterClass: Class[_],
156-
config: Config,
157-
configPropName: String)(implicit ct: ClassTag[T]): Any =
152+
private def getValue[T <: jl.Enum[T]](beanClass: Class[_],
153+
parameterType: Type,
154+
parameterClass: Class[_],
155+
config: Config,
156+
configPropName: String): Any =
158157
if ((parameterClass == classOf[jl.Boolean]) || (parameterClass == classOf[
159158
Boolean])) config.getBoolean(configPropName)
160159
else if ((parameterClass == classOf[Integer]) || (parameterClass == classOf[
@@ -229,7 +228,8 @@ object ConfigBeanImpl {
229228
parameterType: Type,
230229
parameterClass: Class[_],
231230
config: Config,
232-
configPropName: String)(implicit ct: ClassTag[T]): ju.List[_] = {
231+
configPropName: String): ju.List[_] = {
232+
233233
val elementType: Type =
234234
parameterType.asInstanceOf[ParameterizedType].getActualTypeArguments()(0)
235235
if (elementType == classOf[jl.Boolean])

0 commit comments

Comments
 (0)