From 81d3a80344816d6619e8a547f63d525febc561fb Mon Sep 17 00:00:00 2001 From: Sergey Okatov Date: Tue, 26 Sep 2023 17:27:25 +0500 Subject: [PATCH 1/2] Support for ARM64 platform is added to the project --- README.md | 1 + .../cache4k/buildlogic/convention/ConventionPlugin.kt | 2 ++ gradle/libs.versions.toml | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index baf148b..f4ee465 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ The following targets are currently supported: - watchosArm64 - watchosSimulatorArm64 - linuxX64 +- linuxArm64 - mingwX64 ## Download diff --git a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt index 062a0ff..3513ba2 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt @@ -136,6 +136,7 @@ private fun KotlinMultiplatformExtension.configureTargets(project: Project) { withWatchosArm64() withWatchosSimulatorArm64() withLinuxX64() + withLinuxArm64() withMingwX64() } } @@ -194,6 +195,7 @@ private fun KotlinMultiplatformExtension.configureTargets(project: Project) { watchosArm64() watchosSimulatorArm64() linuxX64() + linuxArm64() mingwX64() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4885dc2..0b26128 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ binaryCompabilityValidator = "0.13.2" toolchainsResolver = "0.5.0" detekt = "1.23.1" mavenPublish = "0.25.3" -coroutines = "1.7.2" -atomicfu = "0.21.0" +coroutines = "1.7.3" +atomicfu = "0.22.0" lincheck = "2.17" -statelyIso = "1.2.5" +statelyIso = "2.0.4" [libraries] plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } From bad2517f6d2370fd7b9b4c802c0e1d6aae1ae5ed Mon Sep 17 00:00:00 2001 From: Sergey Okatov Date: Tue, 26 Sep 2023 17:44:05 +0500 Subject: [PATCH 2/2] Support for ARM64 platform is added to the project: rollback unnecessary versions update. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b26128..4488e20 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,8 @@ binaryCompabilityValidator = "0.13.2" toolchainsResolver = "0.5.0" detekt = "1.23.1" mavenPublish = "0.25.3" -coroutines = "1.7.3" -atomicfu = "0.22.0" +coroutines = "1.7.2" +atomicfu = "0.21.0" lincheck = "2.17" statelyIso = "2.0.4"