Fix compatibility with 1.3.40-eap-105

Author: orangy

README.md

@@ -1,12 +1,18 @@
 [![JetBrains incubator project](https://jb.gg/badges/incubator.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
+[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.benchmark/images/download.svg) ](https://bintray.com/kotlin/kotlinx/kotlinx.benchmark/_latestVersion)
 
-`kotlinx.benchmark` is a toolkit for running benchmarks for code written in Kotlin 
+**kotlinx.benchmark** is a toolkit for running benchmarks for multiplatform code written in Kotlin 
 and running on all supported targets: JVM, JavaScript and Native. 
 
 If you're familiar with [JMH](https://openjdk.java.net/projects/code-tools/jmh/), it is very similar and uses it under 
 the hoods to run benchmarks on JVM.   
 
+# Requirements
+
+Gradle 5.1 or newer
+Kotlin 1.3.40 or newer
+
 # Gradle plugin
 
 Add repository in `settings.gradle` to enable bintray repository for plugin lookup
@@ -20,31 +26,22 @@ pluginManagement {
 }
 ```
 
-TODO: This is not needed in latest Gradle versions.  
-If you are using it for Kotlin Multiplatform, enable metadata in `settings.gradle`:
+For Kotlin/JS specify building `nodejs` flavour:
 
 ```groovy
-enableFeaturePreview('GRADLE_METADATA')
-```
-
-TODO: Migrate to 1.3.40 node.js integrated support. 
-For Kotlin/JS code, add Node plugin as well:
-
-```groovy
-plugins {
-    id 'kotlinx.team.node' 
-}
-
-node {
-    version = "$node_version"
+kotlin {
+    js {
+        nodejs()
+        …
+    }   
 }
 ```
 
 For Kotlin/JVM code, add `allopen` plugin to make JMH happy. Alternatively, make all benchmark classes and methods `open`.
 
 ```groovy
 plugins {
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.31"
+    id 'org.jetbrains.kotlin.plugin.allopen'
 }
 
 allOpen {
@@ -82,7 +79,7 @@ benchmark {
 }
 ```
 
-Example for plain Java project:
+This package can also be used for Java and Kotlin/JVM projects. Register a Java sourceSet as a target:
 
 ```groovy
 benchmark {

examples/kotlin-kts/build.gradle.kts

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
 plugins {
     java
     kotlin("jvm") 
-    kotlin("plugin.allopen") version "1.3.40-eap-104"
+    kotlin("plugin.allopen") version "1.3.40-eap-105"
     id("kotlinx.benchmark") version "0.2.0" 
 }
 

examples/kotlin-multiplatform/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-104"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-105"
     id 'kotlinx.benchmark' version "0.2.0"
     id 'kotlinx.team.node'
 }
@@ -17,13 +17,11 @@ allOpen {
 }
 
 kotlin {
-/*
     infra {
         target('macosX64')
         target('linuxX64')
         target('mingwX64')
     }
-*/
 
     jvm {
         compilations.all {

examples/kotlin/benchmarks/src/TestBenchmark.kt

@@ -2,6 +2,7 @@ package test
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.*
+import kotlin.math.*
 
 @State(Scope.Benchmark)
 @Fork(1)
@@ -17,11 +18,11 @@ class TestBenchmark {
 
     @Benchmark
     fun sqrtBenchmark(): Double {
-        return Math.sqrt(data.value)
+        return sqrt(data.value)
     }
 
     @Benchmark
     fun cosBenchmark(): Double {
-        return Math.cos(data.value)
+        return cos(data.value)
     }
 }

examples/kotlin/build.gradle

@@ -1,11 +1,10 @@
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' 
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-104"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-105"
     id 'kotlinx.benchmark' version '0.2.0' 
 }
 
-apply from: rootProject.file('gradle/shared.gradle')
 
 // how to apply plugin to a specific source set?
 allOpen {
@@ -17,9 +16,24 @@ sourceSets {
     benchmarks
 }
 
+sourceSets.all {
+    kotlin.srcDirs = ["$it.name/src"]
+    java.srcDirs = ["$it.name/src"]
+    resources.srcDirs = ["$it.name/resources"]
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+
 // Propagate dependencies from main sourceSet
 // You can add "+ sourceSets.test.output" to include test output as well
 dependencies {
+    api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
     implementation(project(":kotlinx.benchmark.runtime"))
     benchmarksCompile sourceSets.main.output + sourceSets.main.runtimeClasspath 
 }

gradle.properties

@@ -3,7 +3,7 @@ group = org.jetbrains.kotlinx
 version = 0.2.0
 
 kotlin.code.style=official
-kotlin_version=1.3.40-eap-104
+kotlin_version=1.3.40-eap-105
 jmhVersion=1.21
 junit_version=4.12
 

gradle/pom.gradle

@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'java-gradle-plugin'
-    id 'org.jetbrains.kotlin.jvm' version "1.3.40-eap-104"
+    id 'org.jetbrains.kotlin.jvm' version "1.3.40-eap-105"
 }
 
 apply plugin: 'kotlinx.team.infra'
@@ -76,9 +76,7 @@ dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-native-library-reader', version: kotlin_version, {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-compiler'
     }
-
-    compileOnly "kotlinx.team:kotlinx.team.infra:$infra_version"
-
+    
     compileOnly group: 'org.jetbrains.kotlin.multiplatform', name: 'org.jetbrains.kotlin.multiplatform.gradle.plugin', version: kotlin_version
     compileOnly "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" // used in worker