From acb4052fe46965c830d65d0fedc45f653077d5b2 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Sat, 10 Apr 2021 15:20:09 +0300
Subject: [PATCH] Migrate to gradle 7.0 and suspend-inline bug

---
 build.gradle.kts                                       | 10 ++++++----
 examples/build.gradle.kts                              |  5 ++++-
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 .../kscience/kmath/operations/algebraExtensions.kt     |  8 ++++++--
 settings.gradle.kts                                    |  4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 59e93e67f..40ce768cd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import ru.mipt.npm.gradle.KSciencePublishingPlugin
 import java.net.URL
 
 plugins {
@@ -13,16 +12,19 @@ allprojects {
         maven("https://dl.bintray.com/egor-bogomolov/astminer/")
         maven("https://dl.bintray.com/hotkeytlt/maven")
         maven("https://jitpack.io")
-        maven("http://logicrunch.research.it.uu.se/maven/")
+        maven{
+            setUrl("http://logicrunch.research.it.uu.se/maven/")
+            isAllowInsecureProtocol = true
+        }
         mavenCentral()
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-5"
+    version = "0.3.0-dev-6"
 }
 
 subprojects {
-    if (name.startsWith("kmath")) apply<KSciencePublishingPlugin>()
+    if (name.startsWith("kmath")) apply<MavenPublishPlugin>()
 
     afterEvaluate {
         tasks.withType<DokkaTask> {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index a48b4d0d9..5968f118c 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -20,7 +20,10 @@ repositories {
     maven("https://dl.bintray.com/mipt-npm/dev")
     maven("https://dl.bintray.com/mipt-npm/kscience")
     maven("https://jitpack.io")
-    maven("http://logicrunch.research.it.uu.se/maven/")
+    maven{
+        setUrl("http://logicrunch.research.it.uu.se/maven/")
+        isAllowInsecureProtocol = true
+    }
     mavenCentral()
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..f371643ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
index b927655e3..93ce92f37 100644
--- a/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
+++ b/kmath-core/src/commonMain/kotlin/space/kscience/kmath/operations/algebraExtensions.kt
@@ -7,7 +7,9 @@ package space.kscience.kmath.operations
  * @param data the iterable to sum up.
  * @return the sum.
  */
-public fun <T> Group<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, right -> add(left, right) }
+public fun <T> Group<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, right ->
+    add(left, right)
+}
 
 /**
  * Returns the sum of all elements in the sequence in this [Group].
@@ -16,7 +18,9 @@ public fun <T> Group<T>.sum(data: Iterable<T>): T = data.fold(zero) { left, righ
  * @param data the sequence to sum up.
  * @return the sum.
  */
-public fun <T> Group<T>.sum(data: Sequence<T>): T = data.fold(zero) { left, right -> add(left, right) }
+public fun <T> Group<T>.sum(data: Sequence<T>): T = data.fold(zero) { left, right ->
+    add(left, right)
+}
 
 /**
  * Returns an average value of elements in the iterable in this [Group].
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4467d5ed6..e419ac0e2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,8 +7,8 @@ pluginManagement {
         maven("https://dl.bintray.com/kotlin/kotlinx")
     }
 
-    val toolsVersion = "0.9.3"
-    val kotlinVersion = "1.4.32"
+    val toolsVersion = "0.9.5"
+    val kotlinVersion = "1.5.0-M2"
 
     plugins {
         id("kotlinx.benchmark") version "0.2.0-dev-20"