Skip to content

Commit c96ba4f

Browse files
Revert metaconfig 0.9.11 bump
#1414
1 parent 76c1172 commit c96ba4f

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

build.sbt

+3-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,9 @@ lazy val core = project
6767
libraryDependencies ++= List(
6868
scalameta,
6969
googleDiff,
70+
metaconfig,
7071
collectionCompat
71-
),
72-
libraryDependencies += (if (isScala211.value) metaconfigFor211
73-
else metaconfig)
72+
)
7473
)
7574
.enablePlugins(BuildInfoPlugin)
7675

@@ -273,8 +272,7 @@ lazy val docs = project
273272
scalacOptions += "-Xfatal-warnings",
274273
mdoc := (Compile / run).evaluated,
275274
crossScalaVersions := List(scala213),
276-
libraryDependencies += (if (isScala211.value) metaconfigDocFor211
277-
else metaconfigDoc)
275+
libraryDependencies += metaconfigDoc
278276
)
279277
.dependsOn(testkit, core, cli)
280278
.enablePlugins(DocusaurusPlugin)

project/Dependencies.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ object Dependencies {
2020
val googleDiffV = "1.3.0"
2121
val java8CompatV = "0.9.0"
2222
val jgitV = "5.11.1.202105131744-r"
23-
val metaconfigFor211V = "0.9.10" // metaconfig stops publishing for scala 2.11
24-
val metaconfigV = "0.9.11"
23+
val metaconfigV = "0.9.10" // blocked by https://github.com/scalameta/metaconfig/pull/131
2524
val nailgunV = "0.9.1"
2625
val scalaXmlV = "1.3.0"
2726
val scalametaV = "4.4.20"
@@ -35,9 +34,7 @@ object Dependencies {
3534
val googleDiff = "com.googlecode.java-diff-utils" % "diffutils" % googleDiffV
3635
val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % java8CompatV
3736
val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % jgitV
38-
val metaconfigFor211 = "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigFor211V
3937
val metaconfig = "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV
40-
val metaconfigDocFor211 = "com.geirsson" %% "metaconfig-docs" % metaconfigFor211V
4138
val metaconfigDoc = "com.geirsson" %% "metaconfig-docs" % metaconfigV
4239
val metacp = "org.scalameta" %% "metacp" % scalametaV
4340
val nailgunServer = "com.martiansoftware" % "nailgun-server" % nailgunV

scalafix-tests/unit/src/test/scala/scalafix/tests/config/DisableSyntaxConfigSuite.scala

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package scalafix.tests.config
22

3+
import metaconfig.ConfError
34
import metaconfig.Configured
45
import metaconfig.Configured.NotOk
56
import metaconfig.typesafeconfig._
67
import org.scalatest.funsuite.AnyFunSuite
78
import scalafix.internal.rule._
8-
import scalafix.tests.util.ScalaVersions
99

1010
class DisableSyntaxConfigSuite extends AnyFunSuite {
1111
test("Warn about invalid keywords") {
@@ -36,17 +36,9 @@ class DisableSyntaxConfigSuite extends AnyFunSuite {
3636
|]
3737
|""".stripMargin
3838
val errorMessage =
39-
if (ScalaVersions.isScala211)
40-
"""|Type mismatch;
41-
| found : Number (value: 42)
42-
| expected : String""".stripMargin
43-
else
44-
"""|<input>:2:0 error: Type mismatch;
45-
| found : Number (value: 42)
46-
| expected : String
47-
| 42
48-
|^
49-
|""".stripMargin
39+
"""|Type mismatch;
40+
| found : Number (value: 42)
41+
| expected : String""".stripMargin
5042
assertError(rawConfig, errorMessage)
5143
}
5244

@@ -80,6 +72,7 @@ class DisableSyntaxConfigSuite extends AnyFunSuite {
8072

8173
def assertError(rawConfig: String, errorMessage: String): Unit = {
8274
val obtained = read(rawConfig)
83-
assert(obtained.asInstanceOf[NotOk].error.msg == errorMessage)
75+
val expected = NotOk(ConfError.message(errorMessage))
76+
assert(obtained == expected)
8477
}
8578
}

0 commit comments

Comments
 (0)