Skip to content

Commit 1f8fbb7

Browse files
committed
Migrate to kotlinx.benchmark, step 1
1 parent b88868a commit 1f8fbb7

28 files changed

+57
-58
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ apply plugin: 'kotlinx.team.infra'
1616

1717
infra {
1818
teamcity {
19-
projectName = "gradle-benchmarks"
19+
projectName = "kotlinx-benchmark"
2020
bintrayUser = "orangy"
2121
bintrayToken = "credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
2222
}
2323

2424
publishing {
25-
include(":runtime")
25+
include(":kotlinx.benchmark.runtime")
2626

2727
bintray {
28-
organization = 'orangy'
29-
repository = 'maven'
30-
library = 'gradle-benchmarks'
28+
organization = 'kotlin'
29+
repository = 'kotlinx'
30+
library = 'kotlinx.benchmark'
3131

3232
username = findProperty('bintrayUser')
3333
password = findProperty('bintrayApiKey')
@@ -44,6 +44,6 @@ infra {
4444

4545
afterEvaluate {
4646
gradle.includedBuilds.forEach { included ->
47-
project(":runtime").tasks.named("publishToMavenLocal") { dependsOn(included.task(":publishToMavenLocal")) }
47+
project(":kotlinx.benchmark.runtime").tasks.named("publishToMavenLocal") { dependsOn(included.task(":publishToMavenLocal")) }
4848
}
4949
}

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
group 'org.jetbrains.gradle.benchmarks.examples'
1+
group 'org.jetbrains.kotlinx.benchmark.examples'
22
version '0.1-SNAPSHOT'
33

44
subprojects {

examples/java/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
id 'java'
3-
id 'org.jetbrains.gradle.benchmarks.plugin' version '0.1.7'
3+
id 'kotlinx.benchmark' version '0.1.7'
44
}
55

66
dependencies {
7-
implementation(project(":runtime"))
7+
implementation(project(":kotlinx.benchmark.runtime"))
88
}
99

1010
benchmark {

examples/kotlin-kts/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
import org.jetbrains.gradle.benchmarks.*
3+
import kotlinx.benchmark.gradle.*
44
import org.jetbrains.kotlin.allopen.gradle.*
55
import org.jetbrains.kotlin.gradle.tasks.*
66

77
plugins {
88
java
99
kotlin("jvm")
1010
kotlin("plugin.allopen") version "1.3.30"
11-
id("org.jetbrains.gradle.benchmarks.plugin") version "0.1.7"
11+
id("kotlinx.benchmark") version "0.1.7"
1212
}
1313

1414
sourceSets.all {
@@ -22,7 +22,7 @@ configure<AllOpenExtension> {
2222

2323
dependencies {
2424
kotlin("kotlin-stdlib-jdk8")
25-
implementation(project(":runtime"))
25+
implementation(project(":kotlinx.benchmark.runtime"))
2626
}
2727

2828
tasks.withType<KotlinCompile> {

examples/kotlin-multiplatform/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
plugins {
88
id 'org.jetbrains.kotlin.multiplatform'
99
id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.30"
10-
id 'org.jetbrains.gradle.benchmarks.plugin' version "0.1.7"
10+
id 'kotlinx.benchmark' version "0.1.7"
1111
id 'kotlinx.team.node'
1212
}
1313

@@ -56,7 +56,7 @@ kotlin {
5656
commonMain {
5757
dependencies {
5858
implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
59-
implementation project(":runtime")
59+
implementation project(":kotlinx.benchmark.runtime")
6060
}
6161
}
6262
commonTest {

examples/kotlin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'java'
33
id 'org.jetbrains.kotlin.jvm'
44
id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.30"
5-
id 'org.jetbrains.gradle.benchmarks.plugin' version '0.1.7'
5+
id 'kotlinx.benchmark' version '0.1.7'
66
}
77

88
apply from: rootProject.file('gradle/shared.gradle')
@@ -20,7 +20,7 @@ sourceSets {
2020
// Propagate dependencies from main sourceSet
2121
// You can add "+ sourceSets.test.output" to include test output as well
2222
dependencies {
23-
implementation(project(":runtime"))
23+
implementation(project(":kotlinx.benchmark.runtime"))
2424
benchmarksCompile sourceSets.main.output + sourceSets.main.runtimeClasspath
2525
}
2626

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Set up your maven coordinates here, artifactId is defined per project.
2-
group = org.jetbrains.gradle.benchmarks
2+
group = org.jetbrains.kotlinx
33
version = 0.1.7
44

55
kotlin.code.style=official

plugin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ repositories {
4646
gradlePlugin {
4747
plugins {
4848
benchmarkPlugin {
49-
id = "org.jetbrains.gradle.benchmarks.plugin"
50-
implementationClass = "org.jetbrains.gradle.benchmarks.BenchmarksPlugin"
49+
id = "kotlinx.benchmark"
50+
implementationClass = "kotlinx.benchmark.gradle.BenchmarksPlugin"
5151
}
5252
}
5353
}

plugin/gradle.properties

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@ kotlin.code.style=official
22

33
# Set up your maven coordinates here, artifactId is defined per project.
44
version = 0.1.7
5-
group = org.jetbrains.gradle.benchmarks
5+
group = org.jetbrains.kotlinx
66

77
# Put link to your OSS repository. Bintray requires this to be filled for free OpenSource tiers.
8-
vcs=https://github.com/orangy/gradle-benchmarks
9-
10-
# Put your Bintray organization name here, e.g. your bintray username.
11-
bintrayOrg=orangy
12-
13-
# Put your Bintray repository name here, e.g. maven.
14-
bintrayRepository=maven
15-
16-
# Put name of your package here.
17-
bintrayPackage=gradle-benchmarks
18-
8+
vcs=https://github.com/kotlin/kotlinx-benchmark
9+
1910
kotlin_version=1.3.30
2011
jmhVersion=1.21
2112
infra_version=0.1.0-dev-47

plugin/main/src/org/jetbrains/gradle/benchmarks/BenchmarkConfiguration.kt renamed to plugin/main/src/kotlinx/benchmark/gradle/BenchmarkConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.gradle.benchmarks
1+
package kotlinx.benchmark.gradle
22

33
import org.gradle.api.tasks.*
44
import org.jetbrains.kotlin.gradle.plugin.mpp.*

0 commit comments

Comments
 (0)