From 5cf9a0b2c1a6e65f2ddc9b125583833dd08d1756 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Wed, 1 Jul 2020 22:22:11 +0300
Subject: [PATCH] Gradle build adjustments

---
 benchmarks/build.gradle.kts | 8 ++++++++
 build.gradle.kts            | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 0fb33da..f6b25a3 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,3 +1,11 @@
+buildscript {
+    // Workaround, remove once kotlinx.benchmark build for 1.4-M2 is available
+    configurations["classpath"].resolutionStrategy.eachDependency { 
+        if (requested.group == "org.jetbrains.kotlin")
+            useVersion(System.getProperty("build.kotlinVersion"))
+    }
+}
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.allopen")
diff --git a/build.gradle.kts b/build.gradle.kts
index 60b9ed3..d7560f0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -90,10 +90,10 @@ kotlin.sourceSets.commonMain {
 
 //region Publication
 
-val publicationsFromWindows = listOf("mingwX64")
+val publicationsFromWindows = listOf("mingwX64", "mingwX86")
 
 val publicationsFromMacos =
-    kotlin.targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget::class).names.filter {
+    kotlin.targets.names.filter {
         it.startsWith("macos") || it.startsWith("ios") || it.startsWith("watchos") || it.startsWith("tvos")
     }