diff --git a/.travis.yml b/.travis.yml index 475e9ac5..e83fb1e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,15 @@ language: scala - -script: - - sbt ++2.11.12 readme/run - - sbt ++$TRAVIS_SCALA_VERSION scalatagsJVM/test scalatagsJS/test - -scala: - - 2.11.12 - - 2.12.8 - - 2.13.0-M5 +sudo: required +dist: trusty +addons: + apt: + update: true jdk: - oraclejdk8 - - openjdk11 -env: - - SCALAJS_VERSION="0.6.26" - - SCALAJS_VERSION="1.0.0-M6 - -sudo: false - -# cache stuff, hopefully shortening build times -cache: - directories: - - $HOME/.ivy2 - - $HOME/.sbt/boot - - $HOME/.sbt/launchers - - $HOME/.coursier -before_cache: - - find $HOME/.sbt -name "*.lock" | xargs rm - - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm +script: + - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.4.0/0.4.0-12-102ddf && chmod +x ~/bin/mill + - curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x + - export PATH=~/bin/mill:$PATH + - mill __.test \ No newline at end of file diff --git a/build.sbt b/build.sbt index c6e20841..fd54b460 100644 --- a/build.sbt +++ b/build.sbt @@ -1,92 +1,3 @@ -import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} - -scalaVersion := "2.11.12" - -resolvers in ThisBuild += Resolver.sonatypeRepo("releases") - -lazy val scalatags = crossProject(JVMPlatform, JSPlatform, NativePlatform) - .settings( - organization := "com.lihaoyi", - name := "scalatags", - scalaVersion := "2.11.12", - - autoCompilerPlugins := true, - libraryDependencies ++= Seq( - //"com.lihaoyi" %% "acyclic" % "0.2.0" % "provided", - "com.lihaoyi" %%% "utest" % "0.6.9" % "test", - "com.lihaoyi" %%% "sourcecode" % "0.1.7", - "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided", - "org.scala-lang.modules" %% "scala-xml" % "1.2.0" % "test" - ), - //addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.2.0"), - testFrameworks += new TestFramework("utest.runner.Framework"), - // Sonatype - version := _root_.scalatags.Constants.version, - publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"), - - pomExtra := - https://github.com/lihaoyi/scalatags - - - MIT license - http://www.opensource.org/licenses/mit-license.php - - - - git://github.com/lihaoyi/scalatags.git - scm:git://github.com/lihaoyi/scalatags.git - - - - lihaoyi - Li Haoyi - https://github.com/lihaoyi - - - ) - .jvmSettings( - crossScalaVersions := Seq("2.12.8", "2.13.0") - ) - .jsSettings( - crossScalaVersions := Seq("2.12.8", "2.13.0"), - libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.9.7" - ), - jsEnv := new org.scalajs.jsenv.nodejs.JSDOMNodeJSEnv(), - scalacOptions ++= (if (isSnapshot.value) Seq.empty else Seq({ - val a = baseDirectory.value.toURI.toString.replaceFirst("[^/]+/?$", "") - val g = "https://raw.githubusercontent.com/lihaoyi/scalatags" - s"-P:scalajs:mapSourceURI:$a->$g/${version.value}/scalatags/" - })) - ) - .nativeSettings( - crossScalaVersions := Seq("2.11.12"), - nativeLinkStubs := true - ) - - -// Needed, so sbt finds the projects -lazy val scalatagsJVM = scalatags.jvm -lazy val scalatagsJS = scalatags.js -lazy val scalatagsNative = scalatags.native - -lazy val example = project.in(file("example")) - .dependsOn(scalatagsJS) - .enablePlugins(ScalaJSPlugin) - .settings( - scalaVersion := "2.12.8", - scalacOptions ++= Seq( - "-deprecation", // warning and location for usages of deprecated APIs - "-feature", // warning and location for usages of features that should be imported explicitly - "-unchecked", // additional warnings where generated code depends on assumptions - "-Xlint", // recommended additional warnings - "-Xcheckinit", // runtime error when a val is not initialized due to trait hierarchies (instead of NPE somewhere else) - "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver - "-Ywarn-value-discard", // Warn when non-Unit expression results are unused - "-Ywarn-inaccessible", - "-Ywarn-dead-code" - ) - ) lazy val readme = scalatex.ScalatexReadme( projectId = "readme", diff --git a/build.sc b/build.sc new file mode 100644 index 00000000..c3dd4650 --- /dev/null +++ b/build.sc @@ -0,0 +1,107 @@ +import mill._, scalalib._, scalajslib._, scalanativelib._, publish._ + + +trait ScalatagsPublishModule extends PublishModule { + def artifactName = "scalatags" + + def publishVersion = "0.7.1" + + def pomSettings = PomSettings( + description = artifactName(), + organization = "com.lihaoyi", + url = "https://github.com/lihaoyi/scalatags", + licenses = Seq(License.MIT), + scm = SCM( + "git://github.com/lihaoyi/scalatags.git", + "scm:git://github.com/lihaoyi/scalatags.git" + ), + developers = Seq( + Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi") + ) + ) +} + +trait Common extends CrossScalaModule { + def millSourcePath = super.millSourcePath / offset + def ivyDeps = Agg( + ivy"com.lihaoyi::sourcecode::0.1.7", + ) + def compileIvyDeps = Agg( + ivy"org.scala-lang:scala-reflect:${scalaVersion()}", + ) + def offset: os.RelPath = os.rel + def sources = T.sources( + super.sources() + .flatMap(source => + Seq( + PathRef(source.path / os.up / source.path.last), + PathRef(source.path / os.up / os.up / source.path.last), + ) + ) + ) +} + +trait CommonTestModule extends ScalaModule with TestModule { + def millSourcePath = super.millSourcePath / os.up + def crossScalaVersion: String + def ivyDeps = Agg( + ivy"com.lihaoyi::utest::0.6.9", + ivy"org.scala-lang.modules::scala-xml:1.2.0", + ) + def offset: os.RelPath = os.rel + def testFrameworks = Seq("utest.runner.Framework") + def sources = T.sources( + super.sources() + .++(CrossModuleBase.scalaVersionPaths(crossScalaVersion, s => millSourcePath / s"src-$s" )) + .flatMap(source => + Seq( + PathRef(source.path / os.up / "test" / source.path.last), + PathRef(source.path / os.up / os.up / "test" / source.path.last), + ) + ) + .distinct + ) +} + + +object scalatags extends Module { + object jvm extends Cross[JvmScalatagsModule]("2.12.8", "2.13.0") + class JvmScalatagsModule(val crossScalaVersion: String) + extends Common with ScalaModule with ScalatagsPublishModule { + + object test extends Tests with CommonTestModule{ + def crossScalaVersion = JvmScalatagsModule.this.crossScalaVersion + } + } + + object js extends Cross[JSScalatagsModule](("2.12.8", "0.6.26"), ("2.13.0", "0.6.28")) + class JSScalatagsModule(val crossScalaVersion: String, crossJSVersion: String) + extends Common with ScalaJSModule with ScalatagsPublishModule { + def scalaJSVersion = crossJSVersion + def ivyDeps = super.ivyDeps() ++ Agg( + ivy"org.scala-js::scalajs-dom::0.9.7" + ) + def offset = os.up + object test extends Tests with CommonTestModule{ + def offset = os.up + def crossScalaVersion = JSScalatagsModule.this.crossScalaVersion + } + } + + object native extends Cross[NativeScalatagsModule](("2.11.12", "0.3.8")) + class NativeScalatagsModule(val crossScalaVersion: String, crossScalaNativeVersion: String) + extends Common with ScalaNativeModule with ScalatagsPublishModule { + def scalaNativeVersion = crossScalaNativeVersion + def offset = os.up + object test extends Tests with CommonTestModule{ + def offset = os.up + def crossScalaVersion = NativeScalatagsModule.this.crossScalaVersion + } + } +} + +object example extends ScalaJSModule{ + def scalaVersion = "2.12.8" + def scalaJSVersion = "0.6.26" + def moduleDeps = Seq(scalatags.js("2.12.8", "0.6.26")) +} \ No newline at end of file diff --git a/example/src/main/resources/index-dev.html b/example/resources/index-dev.html similarity index 100% rename from example/src/main/resources/index-dev.html rename to example/resources/index-dev.html diff --git a/example/src/main/resources/index-opt.html b/example/resources/index-opt.html similarity index 100% rename from example/src/main/resources/index-opt.html rename to example/resources/index-opt.html diff --git a/example/src/main/scala/example/ScalaJSExample.scala b/example/src/example/ScalaJSExample.scala similarity index 100% rename from example/src/main/scala/example/ScalaJSExample.scala rename to example/src/example/ScalaJSExample.scala diff --git a/project/build.sbt b/project/build.sbt index d428cce3..5c375a61 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,13 +1 @@ addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11") - -val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28") - -addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) - -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0") - diff --git a/scalatags/js/src/main/scala/scalatags/JsDom.scala b/scalatags/js/src/scalatags/JsDom.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/JsDom.scala rename to scalatags/js/src/scalatags/JsDom.scala diff --git a/scalatags/js/src/main/scala/scalatags/jsdom/Frag.scala b/scalatags/js/src/scalatags/jsdom/Frag.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/jsdom/Frag.scala rename to scalatags/js/src/scalatags/jsdom/Frag.scala diff --git a/scalatags/js/src/main/scala/scalatags/jsdom/SvgTags.scala b/scalatags/js/src/scalatags/jsdom/SvgTags.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/jsdom/SvgTags.scala rename to scalatags/js/src/scalatags/jsdom/SvgTags.scala diff --git a/scalatags/js/src/main/scala/scalatags/jsdom/TagFactory.scala b/scalatags/js/src/scalatags/jsdom/TagFactory.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/jsdom/TagFactory.scala rename to scalatags/js/src/scalatags/jsdom/TagFactory.scala diff --git a/scalatags/js/src/main/scala/scalatags/jsdom/Tags.scala b/scalatags/js/src/scalatags/jsdom/Tags.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/jsdom/Tags.scala rename to scalatags/js/src/scalatags/jsdom/Tags.scala diff --git a/scalatags/js/src/main/scala/scalatags/jsdom/Tags2.scala b/scalatags/js/src/scalatags/jsdom/Tags2.scala similarity index 100% rename from scalatags/js/src/main/scala/scalatags/jsdom/Tags2.scala rename to scalatags/js/src/scalatags/jsdom/Tags2.scala diff --git a/scalatags/js/src/test/scala/scalatags/jsdom/BasicTests.scala b/scalatags/js/test/src/scalatags/jsdom/BasicTests.scala similarity index 100% rename from scalatags/js/src/test/scala/scalatags/jsdom/BasicTests.scala rename to scalatags/js/test/src/scalatags/jsdom/BasicTests.scala diff --git a/scalatags/js/src/test/scala/scalatags/jsdom/DomTests.scala b/scalatags/js/test/src/scalatags/jsdom/DomTests.scala similarity index 100% rename from scalatags/js/src/test/scala/scalatags/jsdom/DomTests.scala rename to scalatags/js/test/src/scalatags/jsdom/DomTests.scala diff --git a/scalatags/js/src/test/scala/scalatags/jsdom/ExampleTests.scala b/scalatags/js/test/src/scalatags/jsdom/ExampleTests.scala similarity index 100% rename from scalatags/js/src/test/scala/scalatags/jsdom/ExampleTests.scala rename to scalatags/js/test/src/scalatags/jsdom/ExampleTests.scala diff --git a/scalatags/js/src/test/scala/scalatags/jsdom/PerfTests.scala b/scalatags/js/test/src/scalatags/jsdom/PerfTests.scala similarity index 100% rename from scalatags/js/src/test/scala/scalatags/jsdom/PerfTests.scala rename to scalatags/js/test/src/scalatags/jsdom/PerfTests.scala diff --git a/scalatags/js/src/test/scala/scalatags/jsdom/StyleSheetTests.scala b/scalatags/js/test/src/scalatags/jsdom/StyleSheetTests.scala similarity index 100% rename from scalatags/js/src/test/scala/scalatags/jsdom/StyleSheetTests.scala rename to scalatags/js/test/src/scalatags/jsdom/StyleSheetTests.scala diff --git a/scalatags/jvm/src/test/resource/page.jade b/scalatags/jvm/test/resource/page.jade similarity index 100% rename from scalatags/jvm/src/test/resource/page.jade rename to scalatags/jvm/test/resource/page.jade diff --git a/scalatags/jvm/src/test/resource/page.mustache b/scalatags/jvm/test/resource/page.mustache similarity index 100% rename from scalatags/jvm/src/test/resource/page.mustache rename to scalatags/jvm/test/resource/page.mustache diff --git a/scalatags/jvm/src/test/resource/para.jade b/scalatags/jvm/test/resource/para.jade similarity index 100% rename from scalatags/jvm/src/test/resource/para.jade rename to scalatags/jvm/test/resource/para.jade diff --git a/scalatags/jvm/src/test/resource/para.mustache b/scalatags/jvm/test/resource/para.mustache similarity index 100% rename from scalatags/jvm/src/test/resource/para.mustache rename to scalatags/jvm/test/resource/para.mustache diff --git a/scalatags/jvm/src/test/scala/scalatags/text/PerfTests.scala b/scalatags/jvm/test/src/scalatags/text/PerfTests.scala similarity index 100% rename from scalatags/jvm/src/test/scala/scalatags/text/PerfTests.scala rename to scalatags/jvm/test/src/scalatags/text/PerfTests.scala diff --git a/scalatags/jvm/src/test/twirl/page.scala.html b/scalatags/jvm/test/twirl/page.scala.html similarity index 100% rename from scalatags/jvm/src/test/twirl/page.scala.html rename to scalatags/jvm/test/twirl/page.scala.html diff --git a/scalatags/jvm/src/test/twirl/para.scala.html b/scalatags/jvm/test/twirl/para.scala.html similarity index 100% rename from scalatags/jvm/src/test/twirl/para.scala.html rename to scalatags/jvm/test/twirl/para.scala.html diff --git a/scalatags/shared/src/main/scala/scalatags/DataTypes.scala b/scalatags/src/scalatags/DataTypes.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/DataTypes.scala rename to scalatags/src/scalatags/DataTypes.scala diff --git a/scalatags/shared/src/main/scala/scalatags/Escaping.scala b/scalatags/src/scalatags/Escaping.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/Escaping.scala rename to scalatags/src/scalatags/Escaping.scala diff --git a/scalatags/shared/src/main/scala/scalatags/Text.scala b/scalatags/src/scalatags/Text.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/Text.scala rename to scalatags/src/scalatags/Text.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Attrs.scala b/scalatags/src/scalatags/generic/Attrs.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Attrs.scala rename to scalatags/src/scalatags/generic/Attrs.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Bundle.scala b/scalatags/src/scalatags/generic/Bundle.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Bundle.scala rename to scalatags/src/scalatags/generic/Bundle.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Core.scala b/scalatags/src/scalatags/generic/Core.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Core.scala rename to scalatags/src/scalatags/generic/Core.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Styles.scala b/scalatags/src/scalatags/generic/Styles.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Styles.scala rename to scalatags/src/scalatags/generic/Styles.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/SvgAttrs.scala b/scalatags/src/scalatags/generic/SvgAttrs.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/SvgAttrs.scala rename to scalatags/src/scalatags/generic/SvgAttrs.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/SvgTags.scala b/scalatags/src/scalatags/generic/SvgTags.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/SvgTags.scala rename to scalatags/src/scalatags/generic/SvgTags.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Tags.scala b/scalatags/src/scalatags/generic/Tags.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Tags.scala rename to scalatags/src/scalatags/generic/Tags.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Tags2.scala b/scalatags/src/scalatags/generic/Tags2.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Tags2.scala rename to scalatags/src/scalatags/generic/Tags2.scala diff --git a/scalatags/shared/src/main/scala/scalatags/generic/Util.scala b/scalatags/src/scalatags/generic/Util.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/generic/Util.scala rename to scalatags/src/scalatags/generic/Util.scala diff --git a/scalatags/shared/src/main/scala/scalatags/package.scala b/scalatags/src/scalatags/package.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/package.scala rename to scalatags/src/scalatags/package.scala diff --git a/scalatags/shared/src/main/scala/scalatags/stylesheet/Core.scala b/scalatags/src/scalatags/stylesheet/Core.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/stylesheet/Core.scala rename to scalatags/src/scalatags/stylesheet/Core.scala diff --git a/scalatags/shared/src/main/scala/scalatags/stylesheet/StyleSheet.scala b/scalatags/src/scalatags/stylesheet/StyleSheet.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/stylesheet/StyleSheet.scala rename to scalatags/src/scalatags/stylesheet/StyleSheet.scala diff --git a/scalatags/shared/src/main/scala/scalatags/text/Builder.scala b/scalatags/src/scalatags/text/Builder.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/text/Builder.scala rename to scalatags/src/scalatags/text/Builder.scala diff --git a/scalatags/shared/src/main/scala/scalatags/text/SvgTags.scala b/scalatags/src/scalatags/text/SvgTags.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/text/SvgTags.scala rename to scalatags/src/scalatags/text/SvgTags.scala diff --git a/scalatags/shared/src/main/scala/scalatags/text/TagFactory.scala b/scalatags/src/scalatags/text/TagFactory.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/text/TagFactory.scala rename to scalatags/src/scalatags/text/TagFactory.scala diff --git a/scalatags/shared/src/main/scala/scalatags/text/Tags.scala b/scalatags/src/scalatags/text/Tags.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/text/Tags.scala rename to scalatags/src/scalatags/text/Tags.scala diff --git a/scalatags/shared/src/main/scala/scalatags/text/Tags2.scala b/scalatags/src/scalatags/text/Tags2.scala similarity index 100% rename from scalatags/shared/src/main/scala/scalatags/text/Tags2.scala rename to scalatags/src/scalatags/text/Tags2.scala diff --git a/scalatags/shared/src/test/scala/scalatags/Main.scala b/scalatags/test/src/scalatags/Main.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/Main.scala rename to scalatags/test/src/scalatags/Main.scala diff --git a/scalatags/shared/src/test/scala/scalatags/TestUtil.scala b/scalatags/test/src/scalatags/TestUtil.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/TestUtil.scala rename to scalatags/test/src/scalatags/TestUtil.scala diff --git a/scalatags/shared/src/test/scala/scalatags/generic/BasicTests.scala b/scalatags/test/src/scalatags/generic/BasicTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/generic/BasicTests.scala rename to scalatags/test/src/scalatags/generic/BasicTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/generic/ExampleTests.scala b/scalatags/test/src/scalatags/generic/ExampleTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/generic/ExampleTests.scala rename to scalatags/test/src/scalatags/generic/ExampleTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/generic/PerfTests.scala b/scalatags/test/src/scalatags/generic/PerfTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/generic/PerfTests.scala rename to scalatags/test/src/scalatags/generic/PerfTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/generic/StyleSheetTests.scala b/scalatags/test/src/scalatags/generic/StyleSheetTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/generic/StyleSheetTests.scala rename to scalatags/test/src/scalatags/generic/StyleSheetTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/BasicTests.scala b/scalatags/test/src/scalatags/text/BasicTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/BasicTests.scala rename to scalatags/test/src/scalatags/text/BasicTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/BundlingTests.scala b/scalatags/test/src/scalatags/text/BundlingTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/BundlingTests.scala rename to scalatags/test/src/scalatags/text/BundlingTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/ExampleTests.scala b/scalatags/test/src/scalatags/text/ExampleTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/ExampleTests.scala rename to scalatags/test/src/scalatags/text/ExampleTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/PerfTests.scala b/scalatags/test/src/scalatags/text/PerfTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/PerfTests.scala rename to scalatags/test/src/scalatags/text/PerfTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/StyleSheetTests.scala b/scalatags/test/src/scalatags/text/StyleSheetTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/StyleSheetTests.scala rename to scalatags/test/src/scalatags/text/StyleSheetTests.scala diff --git a/scalatags/shared/src/test/scala/scalatags/text/TextTests.scala b/scalatags/test/src/scalatags/text/TextTests.scala similarity index 100% rename from scalatags/shared/src/test/scala/scalatags/text/TextTests.scala rename to scalatags/test/src/scalatags/text/TextTests.scala