Merge tag '1.6.4' into kotlinx.coroutines-upgrade
Bug: 239834928
Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff
Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff
Test: manual -- all existing tests and builds should pass
diff --git a/settings.gradle b/settings.gradle
index 44effa7..f0a7648 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@
// JMH
id "net.ltgt.apt" version "0.21"
- id "me.champeau.gradle.jmh" version "0.5.2"
+ id "me.champeau.gradle.jmh" version "0.5.3"
}
repositories {
@@ -18,7 +18,6 @@
}
rootProject.name = 'kotlinx.coroutines'
-enableFeaturePreview('GRADLE_METADATA')
def module(String path) {
int i = path.lastIndexOf('/')
@@ -59,5 +58,3 @@
if (!build_snapshot_train) {
module('js/example-frontend-js')
}
-
-module('integration-testing')