Skip to content

Commit 5e64b5c

Browse files
committed
Extract JMH version
1 parent 915e7cb commit 5e64b5c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

build.sc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,9 @@ trait Core extends ScalaCliCrossSbtModule
435435
|
436436
| def localRepoResourcePath = "$localRepoResourcePath"
437437
|
438-
| def jmhVersion = "1.29"
438+
| def jmhVersion = "${Deps.Versions.jmh}"
439+
| def jmhOrg = "${Deps.jmh.dep.module.organization.value}"
440+
| def jmhModule = "${Deps.jmh.dep.module.name.value}"
439441
|
440442
| def ammoniteVersion = "${Deps.Versions.ammonite}"
441443
| def ammoniteVersionForScala3Lts = "${Deps.Versions.ammoniteForScala3Lts}"

modules/options/src/main/scala/scala/build/Artifacts.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ object Artifacts {
135135
else
136136
Nil
137137

138-
val jmhDependencies = addJmhDependencies.toSeq.map { version =>
139-
dep"org.openjdk.jmh:jmh-generator-bytecode:$version"
140-
}
138+
val jmhDependencies = addJmhDependencies.toSeq
139+
.map(version => dep"${Constants.jmhOrg}:${Constants.jmhModule}:$version")
141140

142141
val maybeSnapshotRepo = {
143142
val hasSnapshots = jvmTestRunnerDependencies.exists(_.version.endsWith("SNAPSHOT")) ||

project/deps.sc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ object Deps {
103103
def coursier = coursierDefault
104104
def coursierCli = coursierDefault
105105
def coursierM1Cli = coursierDefault
106+
def jmh = "1.29"
106107
def jsoniterScala = "2.23.2"
107108
def jsoniterScalaJava8 = "2.13.5.2"
108109
def jsoup = "1.18.1"
@@ -162,6 +163,7 @@ object Deps {
162163
ivy"org.virtuslab.scala-cli.java-class-name:java-class-name_3:${Versions.javaClassName}"
163164
def jgit = ivy"org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r"
164165
def jimfs = ivy"com.google.jimfs:jimfs:1.3.0"
166+
def jmh = ivy"org.openjdk.jmh:jmh-generator-bytecode:${Versions.jmh}"
165167
def jniUtils = ivy"io.get-coursier.jniutils:windows-jni-utils:0.3.3"
166168
def jsoniterCore =
167169
ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScalaJava8}"

0 commit comments

Comments
 (0)