From e7ee73aa4a685968ce7ef928d61b347933b9f542 Mon Sep 17 00:00:00 2001 From: Alejandro Serrano Date: Thu, 20 Jul 2023 10:10:09 +0200 Subject: [PATCH] Bring list of supported Native platforms up-to-date (#74) * Bring list of supported Native platforms up-to-date * Update versions --- ...w-kt.arrow-gradle-config-kotlin.gradle.kts | 84 ++++++++++--------- gradle/libs.versions.toml | 12 +-- 2 files changed, 52 insertions(+), 44 deletions(-) diff --git a/arrow-gradle-config-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts b/arrow-gradle-config-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts index b8b28ac..d711cb9 100644 --- a/arrow-gradle-config-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts +++ b/arrow-gradle-config-kotlin/src/main/kotlin/io.arrow-kt.arrow-gradle-config-kotlin.gradle.kts @@ -38,65 +38,73 @@ if (isKotlinMultiplatform) { nodejs() } + // Native: https://kotlinlang.org/docs/native-target-support.html + // -- Tier 1 -- linuxX64() - linuxArm64() - - mingwX64() - - iosArm32() - iosArm64() + macosX64() + macosArm64() iosSimulatorArm64() iosX64() - macosArm64() - macosX64() - tvosArm64() - tvosSimulatorArm64() - tvosX64() - watchosArm32() - watchosArm64() + // -- Tier 2 -- + linuxArm64() watchosSimulatorArm64() watchosX64() - watchosX86() + watchosArm32() + watchosArm64() + tvosSimulatorArm64() + tvosX64() + tvosArm64() + iosArm64() + // -- Tier 3 -- + mingwX64() + // Android and watchOS not included + // -- Deprecated as of 1.8.20 -- + // iosArm32() // deprecated as of 1.8.20 + // watchosX86() sourceSets { val commonMain by getting - val mingwX64Main by getting + + // Native + // -- Tier 1 -- val linuxX64Main by getting - val linuxArm64Main by getting - val iosArm32Main by getting - val iosArm64Main by getting + val macosX64Main by getting + val macosArm64Main by getting val iosSimulatorArm64Main by getting val iosX64Main by getting - val macosArm64Main by getting - val macosX64Main by getting - val tvosArm64Main by getting - val tvosSimulatorArm64Main by getting - val tvosX64Main by getting - val watchosArm32Main by getting - val watchosArm64Main by getting + // -- Tier 2 -- + val linuxArm64Main by getting val watchosSimulatorArm64Main by getting val watchosX64Main by getting - val watchosX86Main by getting + val watchosArm32Main by getting + val watchosArm64Main by getting + val tvosSimulatorArm64Main by getting + val tvosX64Main by getting + val tvosArm64Main by getting + val iosArm64Main by getting + // -- Tier 3 -- + val mingwX64Main by getting create("nativeMain") { dependsOn(commonMain) - mingwX64Main.dependsOn(this) + // -- Tier 1 -- linuxX64Main.dependsOn(this) - linuxArm64Main.dependsOn(this) - iosArm32Main.dependsOn(this) - iosArm64Main.dependsOn(this) + macosX64Main.dependsOn(this) + macosArm64Main.dependsOn(this) iosSimulatorArm64Main.dependsOn(this) iosX64Main.dependsOn(this) - macosArm64Main.dependsOn(this) - macosX64Main.dependsOn(this) - tvosArm64Main.dependsOn(this) - tvosSimulatorArm64Main.dependsOn(this) - tvosX64Main.dependsOn(this) - watchosArm32Main.dependsOn(this) - watchosArm64Main.dependsOn(this) + // -- Tier 2 -- + linuxArm64Main.dependsOn(this) watchosSimulatorArm64Main.dependsOn(this) watchosX64Main.dependsOn(this) - watchosX86Main.dependsOn(this) + watchosArm32Main.dependsOn(this) + watchosArm64Main.dependsOn(this) + tvosSimulatorArm64Main.dependsOn(this) + tvosX64Main.dependsOn(this) + tvosArm64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + // -- Tier 3 -- + mingwX64Main.dependsOn(this) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a084a74..6fb7aaa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] android = "7.4.1" -arrow = "1.1.5" +arrow = "1.2.0" arrowGradleConfig = "0.11.0" -coroutines = "1.6.4" -dokka = "1.8.10" +coroutines = "1.7.2" +dokka = "1.8.20" gradlePublish = "0.21.0" -javierscSemverGradlePlugin = "0.5.0-alpha.2" -kotlin = "1.8.10" +javierscSemverGradlePlugin = "0.5.0-rc.1" +kotlin = "1.8.22" nexusPublish = "1.3.0" -spotless = "6.17.0" +spotless = "6.20.0" [libraries] android = { module = "com.android.tools.build:gradle", version.ref = "android" }