⬆️ Kotlin 1.1-M04 🎉

See #211
gradle · 3d8b77296a12cf7a26e0c5c9f1ba0893f32be573 · bamboo committed Jan 6, 2017

This commit was signed with a verified signature.

bamboo Rodrigo B. de Oliveira

GPG key ID: EA985E2951C6884A Learn about signing commits · Jan 6, 2017 · 3d8b772
1 parent e0078dc
commit 3d8b77296a12cf7a26e0c5c9f1ba0893f32be573
diff --git a/buildSrc/src/main/kotlin/criterion/Result.kt b/buildSrc/src/main/kotlin/criterion/Result.kt
@@ -33,7 +33,7 @@ abstract class Result<U>(observations: List<U>) {
 
     val median by lazy {
         val middle = points.size / 2
-        if (points.size.mod(2) == 0) {
+        if (points.size.rem(2) == 0) {
             points.subList(middle - 1, middle + 1).average()
         } else {
             points[middle]
diff --git a/kotlin-version.txt b/kotlin-version.txt
@@ -1 +1 @@
-1.1-M03
+1.1-M04
diff --git a/src/main/kotlin/org/gradle/script/lang/kotlin/provider/CachingKotlinCompiler.kt b/src/main/kotlin/org/gradle/script/lang/kotlin/provider/CachingKotlinCompiler.kt
@@ -164,7 +164,7 @@ class CachingKotlinCompiler(
     private fun scriptDefinitionFromTemplate(template: KClass<out Any>, classPath: ClassPath) =
         object : KotlinScriptDefinition(template) {
 
-            override fun <TF> getDependenciesFor(
+            override fun <TF : Any> getDependenciesFor(
                 file: TF,
                 project: Project,
                 previousDependencies: KotlinScriptExternalDependencies?): KotlinScriptExternalDependencies? =
diff --git a/src/main/kotlin/org/gradle/script/lang/kotlin/provider/KotlinScriptClassPathProvider.kt b/src/main/kotlin/org/gradle/script/lang/kotlin/provider/KotlinScriptClassPathProvider.kt
@@ -45,6 +45,9 @@ typealias JarCache = (String, JarGenerator) -> File
 typealias JarGenerator = (File) -> Unit
 
 
+typealias JarGeneratorWithProgress = (File, () -> Unit) -> Unit
+
+
 typealias JarsProvider = () -> Collection<File>
 
 
@@ -102,13 +105,14 @@ class KotlinScriptClassPathProvider(
 
     private fun produceFrom(gradleApiJar: File, id: String, generate: JarGeneratorWithProgress): File =
         jarCache(id) { outputFile ->
-            progressMonitorFor(outputFile, numberOfEntriesIn(gradleApiJar)).use { progressMonitor ->
+            val progressMonitor = progressMonitorFor(outputFile, numberOfEntriesIn(gradleApiJar))
+            try {
                 generateAtomically(outputFile, { generate(it, progressMonitor::onProgress) })
+            } finally {
+                progressMonitor.close()
             }
         }
 
-    typealias JarGeneratorWithProgress = (File, () -> Unit) -> Unit
-
     private fun generateAtomically(outputFile: File, generate: JarGenerator) {
         val tempFile = tempFileFor(outputFile)
         generate(tempFile)