Skip to content

Commit c37626d

Browse files
committed
Make benchmarks run
1 parent 02e0e77 commit c37626d

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

benchmarks/build.gradle.kts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ tasks.register<Copy>("datasets") {
4646
into(file("$buildDir/datasets"))
4747
}
4848

49-
tasks.register("run")
49+
tasks.register("run") {
50+
dependsOn(
51+
"protobuf-java:run",
52+
"protokt:run",
53+
"wire:run"
54+
)
55+
}
5056

5157
subprojects {
5258
apply(plugin = "java")
@@ -55,7 +61,6 @@ subprojects {
5561

5662
dependencies {
5763
implementation(libraries.kotlinStdlib)
58-
implementation(libraries.kotlinReflect)
5964
implementation(libraries.jmhCore)
6065
add("kapt", libraries.jmhGenerator)
6166
}

benchmarks/protobuf-java/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,4 @@ dependencies {
4141

4242
tasks.named("run") {
4343
dependsOn(":benchmarks:datasets")
44-
45-
parent?.tasks?.named("run") {
46-
dependsOn(this@named)
47-
}
4844
}

benchmarks/protokt/build.gradle.kts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,14 @@ configure<JavaApplication> {
2626
executableDir = ".."
2727
}
2828

29-
tasks.withType<JavaCompile> {
30-
enabled = false
31-
}
32-
3329
dependencies {
3430
protobuf(project(":benchmarks:schema"))
3531

36-
implementation(project(":benchmarks:util"))
32+
implementation(libraries.kotlinReflect)
3733
implementation(libraries.protobuf)
34+
implementation(project(":benchmarks:util"))
3835
}
3936

4037
tasks.named("run") {
4138
dependsOn(":benchmarks:datasets")
42-
43-
parent?.tasks?.named("run") {
44-
dependsOn(this@named)
45-
}
4639
}

benchmarks/wire/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,4 @@ sourceSets {
5555

5656
tasks.named("run") {
5757
dependsOn(":benchmarks:datasets")
58-
59-
parent?.tasks?.named("run") {
60-
dependsOn(this@named)
61-
}
6258
}

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,23 @@ object versions {
1919
const val arrow = "0.10.5"
2020
const val autoService = "1.0-rc7"
2121
const val grpc = "1.32.1"
22-
const val jackson = "2.11.3"
2322
const val kollection = "0.7"
2423
const val kotlin = "1.3.72"
2524
const val kotlinxCoroutines = "1.3.7"
2625
const val protobuf = DEFAULT_PROTOBUF_VERSION
2726
const val protobufPlugin = "0.8.13"
28-
const val stringTemplate = "4.3"
27+
const val stringTemplate = "4.3.1"
2928

3029
// Test
30+
const val jackson = "2.11.3"
31+
const val junit = "5.7.0"
32+
const val truth = "1.1"
33+
34+
// Benchmarks
3135
const val datasets = "0.1.0"
32-
const val gradleDownload = "4.0.4"
33-
const val jmh = "1.23"
34-
const val junit = "5.6.2"
35-
const val truth = "1.0.1"
36-
const val wire = "3.0.0-alpha01"
36+
const val gradleDownload = "4.1.1"
37+
const val jmh = "1.26"
38+
const val wire = "3.5.0"
3739

3840
// Third Party
3941
const val protoGoogleCommonProtos = "1.18.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)