Skip to content

Commit 21cf8f7

Browse files
committed
minor test improvement
1 parent 48b6020 commit 21cf8f7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

libs/groovylib/test/src/mill/groovylib/HelloGroovyTests.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ object HelloGroovyTests extends TestSuite {
105105
}
106106

107107
object compileroptions extends GroovyModule {
108+
def javaVersion = "11"
108109
override def groovyVersion: T[String] = crossValue
109-
override def targetBytecode: Task.Simple[Option[String]] = Some("11")
110+
override def targetBytecode: Task.Simple[Option[String]] = Some(javaVersion)
110111
override def enablePreview: Task.Simple[Boolean] = true
111112
override def mainClass = Some("compileroptions.HelloCompilerOptions")
112113
}
@@ -220,6 +221,7 @@ object HelloGroovyTests extends TestSuite {
220221
val classReader = new ClassReader(new FileInputStream(classFilePath.toIO))
221222
val buffer = classReader.b
222223

224+
// see https://en.wikipedia.org/wiki/Java_class_file#General_layout
223225
// Class file format: magic(4) + minor(2) + major(2) + ...
224226
val minor = ((buffer(4) & 0xff) << 8) | (buffer(5) & 0xff)
225227
val major = ((buffer(6) & 0xff) << 8) | (buffer(7) & 0xff)
@@ -240,7 +242,7 @@ object HelloGroovyTests extends TestSuite {
240242

241243
val bytecodeVersion = getBytecodeVersion(compiledClassFile.get)
242244

243-
assert(bytecodeVersion.major == 55)
245+
assert(bytecodeVersion.javaVersion == m.compileroptions.javaVersion)
244246
assert(bytecodeVersion.is11PreviewEnabled)
245247

246248
val Right(_) = eval.apply(m.compileroptions.run()): @unchecked

0 commit comments

Comments
 (0)