From b94c70ecfce42b5549315e903f4a404be683a09f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Jun 2022 18:22:46 +0000 Subject: [PATCH 1/5] Update kotlinCoroutines to v1.6.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a51c72f0717..620029c1222 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.7.0" dokka = "1.6.10" -kotlinCoroutines = "1.6.1" +kotlinCoroutines = "1.6.2" idea = "211.7628.21" # Android Studio Bumblebee (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html) androidxSqlite = "2.2.0" schemaCrawler = "16.16.16" From 8cf9af4f4424d14b06b29f13fc0d38e9a23f371d Mon Sep 17 00:00:00 2001 From: Alec Strong Date: Wed, 22 Jun 2022 08:15:36 -0400 Subject: [PATCH 2/5] Update build.gradle --- extensions/coroutines-extensions/build.gradle | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle index 43d3a109b6f..fad319c730b 100644 --- a/extensions/coroutines-extensions/build.gradle +++ b/extensions/coroutines-extensions/build.gradle @@ -38,19 +38,9 @@ kotlin { implementation project(':drivers:sqljs-driver') } } - nativeMain { - dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${deps.versions.kotlinCoroutines.get()}-native-mt") { - force = true - } - } - } nativeTest { dependencies { implementation project(':drivers:native-driver') - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${deps.versions.kotlinCoroutines.get()}-native-mt") { - force = true - } } } } From 1a84272ca096cebfffb0574262976f1e447b62cd Mon Sep 17 00:00:00 2001 From: Alec Strong Date: Wed, 22 Jun 2022 08:23:48 -0400 Subject: [PATCH 3/5] Update build.gradle --- extensions/async-extensions/build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/extensions/async-extensions/build.gradle b/extensions/async-extensions/build.gradle index 6a04153e656..dd2b7c8b0a1 100644 --- a/extensions/async-extensions/build.gradle +++ b/extensions/async-extensions/build.gradle @@ -23,13 +23,6 @@ kotlin { implementation project(':drivers:sqlite-driver') } } - nativeMain { - dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${deps.versions.kotlinCoroutines.get()}-native-mt") { - force = true - } - } - } } sourceSets.matching { it.name.endsWith("Test") }.all { From 868309955c56eff275754532db3bb5880a09bc71 Mon Sep 17 00:00:00 2001 From: Alec Strong Date: Wed, 22 Jun 2022 08:51:06 -0400 Subject: [PATCH 4/5] Disable freezing --- .github/workflows/PR.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 99b1b2b6797..ac96781591f 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -75,10 +75,6 @@ jobs: if: matrix.os == 'macOS-latest' && matrix.job == 'test' run: ./gradlew iosX64Test --stacktrace - - name: Run ios tests with strict memory model - if: matrix.os == 'macOS-latest' && matrix.job == 'test' - run: ./gradlew iosX64Test -Pkotlin.native.binary.memoryModel=strict --stacktrace - # Build the sample - name: Build the sample if: matrix.os == 'macOS-latest' && matrix.job == 'gradle-plugin-tests' From f17d3be04778a4d0e305151645cc670e3eca403c Mon Sep 17 00:00:00 2001 From: Alec Strong Date: Wed, 22 Jun 2022 13:42:03 -0400 Subject: [PATCH 5/5] Update libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94c8066e221..4c32f8fce98 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.7.0" dokka = "1.6.10" -kotlinCoroutines = "1.6.2" +kotlinCoroutines = "1.6.3" idea = "211.7628.21" # Android Studio Bumblebee (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html) androidxSqlite = "2.2.0" schemaCrawler = "16.16.18"