@@ -3,6 +3,7 @@ package scala.build.tests
33import com .eed3si9n .expecty .Expecty .expect
44
55import java .io .IOException
6+ import scala .Console .println
67import scala .build .Ops .EitherThrowOps
78import scala .build .errors .ToolkitDirectiveMissingVersionError
89import scala .build .options .{
@@ -50,6 +51,27 @@ class SourceGeneratorTests extends munit.FunSuite {
5051 " ivy:file:.../.ivy2/local/"
5152 )
5253
54+ def initializeGit (
55+ cwd : os.Path ,
56+ tag : String = " test-inputs"
57+ gitUserName : String = " testUser"
58+ gitUserEmail :
String = " [email protected] " 59+ ): Unit = {
60+ println(s " Initializing git in $cwd... " )
61+ os.proc(" git" " init" = cwd)
62+ println(s " Setting git user.name to $gitUserName" )
63+ os.proc(" git" " config" " --local" " user.name" = cwd)
64+ println(s " Setting git user.email to $gitUserEmail" )
65+ os.proc(" git" " config" " --local" " user.email" = cwd)
66+ println(s " Adding $cwd to git... " )
67+ os.proc(" git" " add" " ." = cwd)
68+ println(s " Doing an initial commit... " )
69+ os.proc(" git" " commit" " -m" " git init test inputs" = cwd)
70+ println(s " Tagging as $tag... " )
71+ os.proc(" git" " tag" = cwd)
72+ println(s " Git initialized at $cwd" )
73+ }
74+
5375 test(s " BuildInfo source generated " ) {
5476 val inputs = TestInputs (
5577 os.rel / " main.scala" ->
@@ -73,54 +95,61 @@ class SourceGeneratorTests extends munit.FunSuite {
7395 |""" .stripMargin
7496 )
7597
76- inputs.withBuild(baseOptions, buildThreads, bloopConfigOpt) {
77- (root, _, maybeBuild) =>
78- expect(maybeBuild.orThrow.success)
79- val projectDir = os.list(root / " .scala-build"
80- _.baseName.startsWith(root.baseName + " _"
81- )
82- expect(projectDir.size == 1 )
83- val buildInfoPath = projectDir.head / " src_generated" / " main" / " BuildInfo.scala"
84- expect(os.isFile(buildInfoPath))
98+ inputs.fromRoot { root =>
99+ initializeGit(root, " v1.0.0"
85100
86- val buildInfoContent = os.read(buildInfoPath)
101+ inputs.copy(forceCwd = Some (root))
102+ .withBuild(baseOptions, buildThreads, bloopConfigOpt, skipCreatingSources = true ) {
103+ (root, _, maybeBuild) =>
104+ expect(maybeBuild.orThrow.success)
105+ val projectDir = os.list(root / " .scala-build"
106+ _.baseName.startsWith(root.baseName + " _"
107+ )
108+ expect(projectDir.size == 1 )
109+ val buildInfoPath = projectDir.head / " src_generated" / " main" / " BuildInfo.scala"
110+ expect(os.isFile(buildInfoPath))
87111
88- expect(normalizeResolvers(buildInfoContent) ==
89- s """ package scala.cli.build
90- |
91- |object BuildInfo {
92- | val scalaVersion = "3.2.2"
93- | val platform = "JVM"
94- | val jvmVersion = Some("11")
95- | val scalaJsVersion = None
96- | val jsEsVersion = None
97- | val scalaNativeVersion = None
98- | val mainClass = Some("Main")
99- |
100- |
101- | object Main {
102- | val sources = Seq(" ${root / " main.scala" ")
103- | val scalacOptions = Seq("-Xasync")
104- | val scalaCompilerPlugins = Seq("org.wartremover:wartremover_3.2.2:3.0.9")
105- | val dependencies = Seq("com.lihaoyi:os-lib_3:0.9.1")
106- | val resolvers = Seq("ivy:file:.../scala-cli-tests-extra-repo/local-repo/...", "https://repo1.maven.org/maven2", "ivy:file:.../.ivy2/local/")
107- | val resourceDirs = Seq(" ${root / " resources" ")
108- | val customJarsDecls = Seq(" ${root / " TEST1.jar" ", " ${root / " TEST2.jar" ")
109- | }
110- |
111- | object Test {
112- | val sources = Nil
113- | val scalacOptions = Nil
114- | val scalaCompilerPlugins = Nil
115- | val dependencies = Nil
116- | val resolvers = Nil
117- | val resourceDirs = Nil
118- | val customJarsDecls = Nil
119- | }
120- |
121- |}
122- | """ .stripMargin)
112+ val buildInfoContent = os.read(buildInfoPath)
113+
114+ expect(normalizeResolvers(buildInfoContent) ==
115+ s """ package scala.cli.build
116+ |
117+ |object BuildInfo {
118+ | val scalaVersion = "3.2.2"
119+ | val platform = "JVM"
120+ | val jvmVersion = Some("11")
121+ | val scalaJsVersion = None
122+ | val jsEsVersion = None
123+ | val scalaNativeVersion = None
124+ | val mainClass = Some("Main")
125+ | val projectVersion = Some("1.0.0")
126+ |
127+ |
128+ | object Main {
129+ | val sources = Seq(" ${root / " main.scala" ")
130+ | val scalacOptions = Seq("-Xasync")
131+ | val scalaCompilerPlugins = Seq("org.wartremover:wartremover_3.2.2:3.0.9")
132+ | val dependencies = Seq("com.lihaoyi:os-lib_3:0.9.1")
133+ | val resolvers = Seq("ivy:file:.../scala-cli-tests-extra-repo/local-repo/...", "https://repo1.maven.org/maven2", "ivy:file:.../.ivy2/local/")
134+ | val resourceDirs = Seq(" ${root / " resources" ")
135+ | val customJarsDecls = Seq(" ${root / " TEST1.jar" ", " ${root / " TEST2.jar" ")
136+ | }
137+ |
138+ | object Test {
139+ | val sources = Nil
140+ | val scalacOptions = Nil
141+ | val scalaCompilerPlugins = Nil
142+ | val dependencies = Nil
143+ | val resolvers = Nil
144+ | val resourceDirs = Nil
145+ | val customJarsDecls = Nil
146+ | }
147+ |
148+ |}
149+ | """ .stripMargin)
150+ }
123151 }
152+
124153 }
125154
126155 test(s " BuildInfo for native " ) {
@@ -171,6 +200,7 @@ class SourceGeneratorTests extends munit.FunSuite {
171200 | val jsEsVersion = None
172201 | val scalaNativeVersion = Some("0.4.6")
173202 | val mainClass = Some("Main")
203+ | val projectVersion = None
174204 |
175205 |
176206 | object Main {
@@ -212,6 +242,7 @@ class SourceGeneratorTests extends munit.FunSuite {
212242 |//> using platform scala-js
213243 |//> using jsVersion 1.13.1
214244 |//> using jsEsVersionStr es2015
245+ |//> using computeVersion "command:echo TestVersion"
215246 |
216247 |//> using buildInfo
217248 |
@@ -247,6 +278,7 @@ class SourceGeneratorTests extends munit.FunSuite {
247278 | val jsEsVersion = Some("es2015")
248279 | val scalaNativeVersion = None
249280 | val mainClass = Some("Main")
281+ | val projectVersion = Some("TestVersion")
250282 |
251283 |
252284 | object Main {
@@ -285,6 +317,7 @@ class SourceGeneratorTests extends munit.FunSuite {
285317 |//> using mainClass "Main"
286318 |//> using resourceDir ./resources
287319 |//> using jar TEST1.jar TEST2.jar
320+ |//> using computeVersion "command:echo TestVersion"
288321 |
289322 |//> using buildInfo
290323 |
@@ -320,6 +353,7 @@ class SourceGeneratorTests extends munit.FunSuite {
320353 | val jsEsVersion = None
321354 | val scalaNativeVersion = None
322355 | val mainClass = Some("Main")
356+ | val projectVersion = Some("TestVersion")
323357 |
324358 |
325359 | object Main {
0 commit comments