Skip to content

Commit

Permalink
simplify project names
Browse files Browse the repository at this point in the history
  • Loading branch information
Ondřej Pelech committed May 19, 2022
1 parent eed6d12 commit 7e23ae7
Show file tree
Hide file tree
Showing 26 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: sbt ++${{ matrix.scala }} test

- name: Compress target directories
run: tar cf targets.tar target macroUtils/target core/native/target localesMinimalEnUSDb/native/target localesFullCurrenciesDb/target testSuite/jvm/target core/js/target testSuite/js/target core/jvm/target localesFullDb/.js/target localesFullDb/.native/target localesMinimalEnUSDb/js/target testSuite/native/target demo/native/target localesMinimalEnDb/native/target localesMinimalEnDb/js/target demo/js/target project/target
run: tar cf targets.tar target core/native/target localesMinimalEnUSDb/native/target localesFullCurrenciesDb/target macroutils/target core/js/target core/jvm/target tests/js/target localesFullDb/.js/target localesFullDb/.native/target localesMinimalEnUSDb/js/target tests/jvm/target demo/native/target localesMinimalEnDb/native/target localesMinimalEnDb/js/target tests/native/target demo/js/target project/target

- name: Upload target directories
uses: actions/upload-artifact@v2
Expand Down
22 changes: 11 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ lazy val root: Project = project
core.js,
core.jvm,
core.native,
testSuite.js,
testSuite.jvm,
testSuite.native,
tests.js,
tests.jvm,
tests.native,
localesFullDb.js,
localesFullDb.native,
localesFullCurrenciesDb,
Expand Down Expand Up @@ -218,12 +218,12 @@ lazy val localesMinimalEnUSDb = crossProject(JSPlatform, NativePlatform)
.cross(CrossVersion.for3Use2_13)
)

lazy val testSuite = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.in(file("testSuite"))
lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.in(file("tests"))
.settings(commonSettings)
.settings(
publish / skip := true,
name := "test",
name := "tests",
libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M4" % Test,
testFrameworks += new TestFramework("munit.Framework"),
scalacOptions ~= (_.filterNot(
Expand All @@ -236,7 +236,7 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.jsSettings(Test / parallelExecution := false,
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
)
.jsConfigure(_.dependsOn(core.js, macroUtils, localesFullCurrenciesDb))
.jsConfigure(_.dependsOn(core.js, macroutils, localesFullCurrenciesDb))
.jvmSettings(
// Fork the JVM test to ensure that the custom flags are set
Test / fork := true,
Expand All @@ -251,24 +251,24 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform, NativePlatform)
),
libraryDependencies += "io.github.cquiroz" %%% "cldr-api" % cldrApiVersion
)
.jvmConfigure(_.dependsOn(macroUtils))
.jvmConfigure(_.dependsOn(macroutils))
.nativeSettings(
nativeConfig ~= {
_.withOptimize(false)
// tests fail to link on Scala 2.11 and 2.12 in debug mode
// with the optimizer enabled
}
)
.nativeConfigure(_.dependsOn(core.native, macroUtils, localesFullDb.native))
.nativeConfigure(_.dependsOn(core.native, macroutils, localesFullDb.native))
.platformsSettings(JSPlatform, NativePlatform)(
Test / unmanagedSourceDirectories += baseDirectory.value.getParentFile / "js-native" / "src" / "test" / "scala"
)
.platformsSettings(JSPlatform, JVMPlatform)(
Test / unmanagedSourceDirectories += baseDirectory.value.getParentFile / "js-jvm" / "src" / "test" / "scala"
)

lazy val macroUtils = project
.in(file("macroUtils"))
lazy val macroutils = project
.in(file("macroutils"))
.settings(commonSettings)
.settings(
name := "macroutils",
Expand Down
File renamed without changes.

0 comments on commit 7e23ae7

Please sign in to comment.