Skip to content

Commit d96bd11

Browse files
committed
transfer to sbt
1 parent e19b0c0 commit d96bd11

34 files changed

+59
-114
lines changed

build.gradle

Lines changed: 0 additions & 35 deletions
This file was deleted.

build.sbt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name := "ezXML"
2+
3+
ThisBuild / organization := "jstengel"
4+
ThisBuild / version := "0.1"
5+
ThisBuild / scalaVersion := "2.13.1"
6+
ThisBuild / libraryDependencies := Seq (
7+
"org.scala-lang.modules" %% "scala-xml" % "1.2.0", // https://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml
8+
"junit" % "junit" % "4.12" % Test, // https://mvnrepository.com/artifact/junit/junit
9+
"org.scalatest" %% "scalatest" % "3.1.1" % Test // https://mvnrepository.com/artifact/org.scalatest/scalatest
10+
)
11+
12+
lazy val core = (project in file("core")).settings(name := "ezxml.core")
13+
lazy val extension = (project in file("extension")).dependsOn(core).settings(
14+
name := "ezxml.extension",
15+
scalacOptions += "-Ymacro-annotations",
16+
libraryDependencies += "org.scala-lang" % "scala-reflect" % "2.13.1", // https://mvnrepository.com/artifact/org.scala-lang/scala-reflect,
17+
)
18+
19+
lazy val root = (project in file(".")).aggregate(core, extension)

core/build.gradle

Lines changed: 0 additions & 22 deletions
This file was deleted.

core/settings.gradle

Lines changed: 0 additions & 2 deletions
This file was deleted.

core/src/main/scala/jstengel/ezxml/core/SimpleWrapper.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jstengel.ezxml.core
22

33

4-
import scala.xml._
4+
import scala.xml.{Elem, Attribute, Text, Null, PrettyPrinter, Node, NodeSeq, PrefixedAttribute}
55

66
object SimpleWrapper {
77

@@ -207,7 +207,7 @@ object SimpleWrapper {
207207
* the replacement label.
208208
* A colon denotes if a value has a prefix or not. E.g. :
209209
* "pre1:Test" -> "PreTest" will replace the prefixed label with an unprefixed label
210-
* "preA:A" -> "prefix:LabelA" will replace prfix and label
210+
* "preA:A" -> "prefix:LabelA" will replace prefix and label
211211
* "C" -> "preC:C" adds a prefix to all labels of value "C"
212212
* @return the complete structure of [[elem]], where all labels are renamed according to the defined
213213
* renamingPairs

core/src/main/scala/jstengel/ezxml/core/XmlPath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package jstengel.ezxml.core
22

3-
import jstengel.ezxml.core.SimpleWrapper.{ElemWrapper, NodeWrapper}
3+
import jstengel.ezxml.core.SimpleWrapper.ElemWrapper
44

55
import scala.annotation.tailrec
66
import scala.xml.{Elem, Node}

core/src/test/scala/jstengel/ezxml/core/AddChildrenTest.scala

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package jstengel.ezxml.core
22

33
import SimpleWrapper.ElemWrapper
4-
import org.junit.runner.RunWith
5-
import org.scalatest.FlatSpec
6-
import org.scalatestplus.junit.JUnitRunner
4+
import org.scalatest.flatspec.AnyFlatSpec
75

86
import scala.language.postfixOps
97
import scala.xml.Elem
108

119

1210
/* test that the child is added to the correct path */
13-
@RunWith(classOf[JUnitRunner])
14-
class BasicAddTest extends FlatSpec with BasicChangeTest {
11+
class BasicAddTest extends AnyFlatSpec with BasicChangeTest {
1512
testAdding(_.addChildren(<newChild></newChild>),
1613
<bla>
1714
<aaa>
@@ -38,8 +35,7 @@ class BasicAddTest extends FlatSpec with BasicChangeTest {
3835
}
3936

4037
/* test that the child is added to the correct path */
41-
@RunWith(classOf[JUnitRunner])
42-
class BasicSubAddTest extends FlatSpec with BasicChangeTest {
38+
class BasicSubAddTest extends AnyFlatSpec with BasicChangeTest {
4339
testAdding(_ \~ "aaa" \~ "d" addChildren <newChild></newChild> get,
4440
<bla>
4541
<aaa>
@@ -55,8 +51,7 @@ class BasicSubAddTest extends FlatSpec with BasicChangeTest {
5551
}
5652

5753
/* test that the predicate is used correctly */
58-
//@RunWith(classOf[JUnitRunner])
59-
class PredicateAddTest extends FlatSpec with BasicChangeTest {
54+
class PredicateAddTest extends AnyFlatSpec with BasicChangeTest {
6055
testAdding(_ \~ "_" \~ ("d", _ \@ "data" == "test") addChildren <newChild></newChild> get,
6156
<bla>
6257
<aaa>
@@ -86,8 +81,7 @@ class PredicateAddTest extends FlatSpec with BasicChangeTest {
8681
}
8782

8883
/* test that wrong definitions lead to None when trying to add a child */
89-
@RunWith(classOf[JUnitRunner])
90-
class WrongPredicateAddTest extends FlatSpec with BasicChangeTest {
84+
class WrongPredicateAddTest extends AnyFlatSpec with BasicChangeTest {
9185
"\nTest " should " should return with None, because there is no such child " in {
9286
assert(original \~ "_" \~ ("d", _ \@ "data" == "nope") addChildren <newChild></newChild> isEmpty)
9387
}
@@ -97,8 +91,7 @@ class WrongPredicateAddTest extends FlatSpec with BasicChangeTest {
9791
}
9892

9993
/* test that multiple correct paths lead to multiple add, when no predicate is given */
100-
@RunWith(classOf[JUnitRunner])
101-
class MultipleAddTest extends FlatSpec with BasicChangeTest {
94+
class MultipleAddTest extends AnyFlatSpec with BasicChangeTest {
10295
testAdding(_ \~ "_" \~ "d" addChildren <newChild></newChild> get,
10396
<bla>
10497
<aaa>
@@ -116,8 +109,7 @@ class MultipleAddTest extends FlatSpec with BasicChangeTest {
116109
}
117110

118111
/* test that multiple possible nodes lead to one correct addition add, when no predicate is given */
119-
@RunWith(classOf[JUnitRunner])
120-
class MultipleChoiceAddTest extends FlatSpec with BasicChangeTest {
112+
class MultipleChoiceAddTest extends AnyFlatSpec with BasicChangeTest {
121113
override val original : Elem =
122114
<bla>
123115
<test/>
@@ -160,8 +152,7 @@ class MultipleChoiceAddTest extends FlatSpec with BasicChangeTest {
160152
}
161153

162154
/* test that changes are merged correctly */
163-
@RunWith(classOf[JUnitRunner])
164-
class MergeChangeTest extends FlatSpec with BasicChangeTest {
155+
class MergeChangeTest extends AnyFlatSpec with BasicChangeTest {
165156
override val original : Elem =
166157
<Test data="test1">
167158
<Test data="test21">

core/src/test/scala/jstengel/ezxml/core/BasicChangeTest.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package jstengel.ezxml.core
22

3-
import org.scalatest.FlatSpec
43
import SimpleWrapper.NodeWrapper
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
56
import scala.xml.Elem
67

7-
trait BasicChangeTest { this: FlatSpec =>
8+
trait BasicChangeTest { this: AnyFlatSpec =>
89
val original : Elem =
910
<bla>
1011
<aaa>

core/src/test/scala/jstengel/ezxml/core/WrapperTests.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package jstengel.ezxml.core
22

3-
import org.junit.runner.RunWith
4-
import org.scalatest.FlatSpec
5-
import org.scalatestplus.junit.JUnitRunner
6-
import SimpleWrapper._
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import SimpleWrapper.ElemWrapper
75

86
import scala.xml.Elem
97

10-
@RunWith(classOf[JUnitRunner])
11-
class WrapperTests extends FlatSpec {
8+
class WrapperTests extends AnyFlatSpec {
129
val elem: Elem = <A/>
1310

1411
def test(original : Elem, target : Elem, conversionFunction: Elem => Elem): Unit = {

src/main/scala/jstengel/ezxml/extension/RTWrappers.scala renamed to extension/src/main/scala/jstengel/ezxml/extension/RTWrappers.scala

File renamed without changes.

0 commit comments

Comments
 (0)