From 897f50b9cbb8e7c9860827bfe9b0264458b3f7dd Mon Sep 17 00:00:00 2001 From: Ben Asher Date: Wed, 8 Sep 2021 07:24:16 -0700 Subject: [PATCH 1/5] Update build.gradle.kts --- build.gradle.kts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5247dbc..9bbfcff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,13 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget +import org.jetbrains.kotlin.konan.target.HostManager -val coroutinesVersion = "1.5.0" -val atomicfuVersion = "0.16.1" +val coroutinesVersion = "1.5.2" +val atomicfuVersion = "0.16.3" plugins { - kotlin("multiplatform") version "1.5.21" + kotlin("multiplatform") version "1.5.30" id("org.jetbrains.dokka") version "0.10.0" id("maven-publish") id("signing") @@ -43,11 +44,15 @@ kotlin { iosX64() iosArm64() iosArm32() + iosSimulatorArm64() + macosArm64() macosX64() tvosArm64() + tvosSimulatorArm64() tvosX64() watchosArm32() watchosArm64() + watchosSimulatorArm64() // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679 //watchosX64() watchosX86() @@ -103,11 +108,15 @@ kotlin { "iosX64", "iosArm64", "iosArm32", + "iosSimulatorArm64", + "macosArm64", "macosX64", "tvosArm64", + "tvosSimulatorArm64", "tvosX64", "watchosArm32", "watchosArm64", + "watchosSimulatorArm64", "watchosX86" // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679 //"watchosX64" @@ -132,7 +141,8 @@ kotlin { kotlin { targets.all { compilations.all { - kotlinOptions.allWarningsAsErrors = true + // https://youtrack.jetbrains.com/issue/KT-46257 + kotlinOptions.allWarningsAsErrors = HostManager.hostIsMac } } } From c758609c41d55bd1710948deec6e3cc9b931d005 Mon Sep 17 00:00:00 2001 From: Ben Asher Date: Wed, 8 Sep 2021 07:25:35 -0700 Subject: [PATCH 2/5] Update publish.gradle --- publish.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/publish.gradle b/publish.gradle index 0e1d48e..47946f9 100644 --- a/publish.gradle +++ b/publish.gradle @@ -113,15 +113,19 @@ signing { tasks.register('publishMac') { dependsOn 'publishIosArm64PublicationToMavenRepository' dependsOn 'publishIosArm32PublicationToMavenRepository' + dependsOn 'publishIosSimulatorArm64PublicationToMavenRepository' dependsOn 'publishIosX64PublicationToMavenRepository' dependsOn 'publishJsPublicationToMavenRepository' dependsOn 'publishJvmPublicationToMavenRepository' dependsOn 'publishKotlinMultiplatformPublicationToMavenRepository' + dependsOn 'publishMacosArm64PublicationToMavenRepository' dependsOn 'publishMacosX64PublicationToMavenRepository' dependsOn 'publishTvosArm64PublicationToMavenRepository' + dependsOn 'publishTvosSimulatorArm64PublicationToMavenRepository' dependsOn 'publishTvosX64PublicationToMavenRepository' dependsOn 'publishWatchosArm32PublicationToMavenRepository' dependsOn 'publishWatchosArm64PublicationToMavenRepository' + dependsOn 'publishWatchosSimulatorArm64PublicationToMavenRepository' // waiting on https://github.com/Kotlin/kotlinx.coroutines/pull/2679 //dependsOn 'publishWatchosX64PublicationToMavenRepository' dependsOn 'publishWatchosX86PublicationToMavenRepository' From f1858b779d2dc1e85be3e6c252802dda8acf1410 Mon Sep 17 00:00:00 2001 From: Ben Asher Date: Wed, 8 Sep 2021 07:26:39 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1015756..c5f3c4a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Specs - Supported on Native, JVM, and JS (legacy and IR) (feel free to contribute adding more targets) -- Kotlin 1.5.21 +- Kotlin 1.5.30 ## Gradle From 8937ad8dfdac5fe60f0f1d9f3e03ed4354e7daa4 Mon Sep 17 00:00:00 2001 From: Ben Asher Date: Wed, 8 Sep 2021 07:26:58 -0700 Subject: [PATCH 4/5] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa2f9c8..a09c9b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION=0.7.1 +VERSION=0.7.2 kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.mpp.enableCompatibilityMetadataVariant=true From 57085e05496d4ab3bbc06c2afafe7be9ad381d69 Mon Sep 17 00:00:00 2001 From: Ben Asher Date: Wed, 8 Sep 2021 07:32:35 -0700 Subject: [PATCH 5/5] :( --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9bbfcff..ac1f7ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -142,7 +142,7 @@ kotlin { targets.all { compilations.all { // https://youtrack.jetbrains.com/issue/KT-46257 - kotlinOptions.allWarningsAsErrors = HostManager.hostIsMac + kotlinOptions.allWarningsAsErrors = false } } }