Skip to content

Commit 42ec31d

Browse files
committed
Drop unrelated build.gradle changes from 128-bit PR
Keep only test128 registration, check dependency, and species test task classpath wiring; revert JMH/scala/zinc tweaks. Signed-off-by: The-Alchemist <kap4020@gmail.com>
1 parent 46af178 commit 42ec31d

1 file changed

Lines changed: 8 additions & 38 deletions

File tree

‎build.gradle‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,9 @@ java {
7272
ext {
7373
junitVersion = '5.12.0'
7474
jsoniterScalaVersion = '2.33.2'
75-
scalaVersion = '2.13.18'
76-
}
77-
78-
configurations.named('zinc') {
79-
resolutionStrategy {
80-
force "org.scala-lang:scala-compiler:${scalaVersion}"
81-
force "org.scala-lang:scala-library:${scalaVersion}"
82-
force "org.scala-lang:scala-reflect:${scalaVersion}"
83-
}
8475
}
8576

8677
dependencies {
87-
jmhImplementation group: 'org.scala-lang', name: 'scala-library', version: scalaVersion
8878
jmhImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.2'
8979
jmhImplementation group: 'com.alibaba.fastjson2', name: 'fastjson2', version: '2.0.56'
9080
jmhImplementation group: 'com.github.plokhotnyuk.jsoniter-scala', name: 'jsoniter-scala-core_2.13', version: jsoniterScalaVersion
@@ -133,7 +123,7 @@ tasks.register('downloadTestData', Exec) {
133123
}
134124
}
135125

136-
// Configuration common to ALL Test tasks (including 'test', 'test256', 'test512')
126+
// Configuration common to ALL Test tasks (including 'test', 'test128', 'test256', 'test512')
137127
tasks.withType(Test).configureEach {
138128
dependsOn tasks.named('downloadTestData')
139129

@@ -148,7 +138,7 @@ tasks.withType(Test).configureEach {
148138
}
149139
}
150140

151-
// --- Test Variants (256/512) ---
141+
// --- Test Variants (128/256/512) ---
152142
test {
153143
useJUnitPlatform()
154144
jvmArgs += [
@@ -189,17 +179,7 @@ tasks.withType(JavaCompile).configureEach {
189179
options.compilerArgs.add("--add-modules=jdk.incubator.vector")
190180
}
191181

192-
tasks.named('compileJmhScala', ScalaCompile) {
193-
// jsoniter macros only need the JMH dependency classpath, not main (Java 25) outputs
194-
classpath = sourceSets.jmh.compileClasspath
195-
def jmhScalaJavaHome = System.getenv('JMH_SCALA_JAVA_HOME')
196-
if (jmhScalaJavaHome != null) {
197-
def forkJava = new File(jmhScalaJavaHome, 'bin/java')
198-
if (forkJava.exists()) {
199-
options.forkOptions.executable = forkJava.absolutePath
200-
}
201-
}
202-
}
182+
tasks.compileJmhScala.classpath = sourceSets.main.compileClasspath
203183
tasks.compileJmhJava.classpath += files(sourceSets.jmh.scala.classesDirectory)
204184

205185
compileTestJava {
@@ -214,21 +194,11 @@ javadoc.options {
214194

215195
jmh {
216196
fork = 1
217-
warmupIterations = project.hasProperty('jmh.warmupIterations')
218-
? project.property('jmh.warmupIterations').toString().toInteger() : 3
219-
iterations = project.hasProperty('jmh.iterations')
220-
? project.property('jmh.iterations').toString().toInteger() : 5
221-
if (project.hasProperty('jmh.warmup')) {
222-
warmup = project.property('jmh.warmup').toString()
223-
}
224-
if (project.hasProperty('jmh.timeOnIteration')) {
225-
timeOnIteration = project.property('jmh.timeOnIteration').toString()
226-
}
227-
def jmhJvmArgs = ['--add-modules=jdk.incubator.vector']
228-
if (project.hasProperty('jmh.species')) {
229-
jmhJvmArgs += "-Dorg.simdjson.species=${project.property('jmh.species')}"
230-
}
231-
jvmArgsPrepend = jmhJvmArgs
197+
warmupIterations = 3
198+
iterations = 5
199+
jvmArgsPrepend = [
200+
'--add-modules=jdk.incubator.vector'
201+
]
232202
if (OperatingSystem.current().isLinux()) {
233203
def profilerList = []
234204
if (getBooleanProperty('jmh.asyncProfilerEnabled', false)) {

0 commit comments

Comments
 (0)