Skip to content

Commit 555c776

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-lazylist-cycle
2 parents eedae26 + 7b027e2 commit 555c776

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

build.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
lazy val root = project.in(file("."))
2-
.aggregate(`scala-library-next`.jvm, `scala-library-next`.js)
2+
.aggregate(scalaLibraryNextJVM, scalaLibraryNextJS)
33
.settings(
44
publish / skip := true,
55
// With CrossType.Pure, the root project also picks up the sources in `src`
66
Compile / unmanagedSourceDirectories := Nil,
77
Test / unmanagedSourceDirectories := Nil,
88
)
99

10-
lazy val `scala-library-next` = crossProject(JVMPlatform, JSPlatform)
10+
lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
1111
.crossType(CrossType.Pure)
12-
.withoutSuffixFor(JVMPlatform)
1312
.in(file("."))
1413
.jvmSettings(
1514
libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
@@ -28,3 +27,6 @@ lazy val `scala-library-next` = crossProject(JVMPlatform, JSPlatform)
2827
.jsSettings(
2928
Test / fork := false,
3029
)
30+
31+
lazy val scalaLibraryNextJVM = scalaLibraryNext.jvm
32+
lazy val scalaLibraryNextJS = scalaLibraryNext.js

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ isReleaseJob() {
2525
}
2626

2727
if [[ "$SCALAJS_BUILD" == "true" ]]; then
28-
projectPrefix="scala-library-nextJS/"
28+
projectPrefix="scalaLibraryNextJS/"
2929
else
30-
projectPrefix="scala-library-next/"
30+
projectPrefix="scalaLibraryNextJVM/"
3131
fi
3232

3333
verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"

0 commit comments

Comments
 (0)