From eba6b45df7625b8a5537b307d01bb4ee6fd3783e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20=C5=9Eafak?= Date: Fri, 13 Jan 2023 01:05:31 -0800 Subject: [PATCH] Correct all occurrences of "compatability" (#2623) --- CHANGELOG.md | 2 +- VERSIONING.md | 2 +- ...ilerCompatability.kt => ComposeCompilerCompatibility.kt} | 6 +++--- .../jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt | 2 +- .../src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt | 2 +- ...otlinCompatabilityTest.kt => KotlinCompatibilityTest.kt} | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/{ComposeCompilerCompatability.kt => ComposeCompilerCompatibility.kt} (78%) rename gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/{KotlinCompatabilityTest.kt => KotlinCompatibilityTest.kt} (96%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ce40f4eff..50f22d001a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,7 +84,7 @@ This version of Compose Multiplatform is based on the next Jetpack Compose libra - [Documentation for how to package apps using Conveyor](https://github.com/JetBrains/compose-jb/tree/master/tutorials/Native_distributions_and_local_execution#available-tools) ### Fixes -- [Fix IDEA plugin compatability](https://github.com/JetBrains/compose-jb/pull/2318) +- [Fix IDEA plugin compatibility](https://github.com/JetBrains/compose-jb/pull/2318) - Fixes for Right-to-Left languages support - [LayoutDirection is detected from the system settings](https://github.com/JetBrains/androidx/pull/264) - [Fix RTL selection in a multiline text](https://github.com/JetBrains/androidx/pull/285) diff --git a/VERSIONING.md b/VERSIONING.md index 96a0d36f24..38ae3ec108 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -1,4 +1,4 @@ -## Compatability and versioning overview +## Compatibility and versioning overview ### Supported platforms * macOS (x86-64, arm64) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt similarity index 78% rename from gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt rename to gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt index cd2762459b..b06d166995 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt @@ -1,9 +1,9 @@ package org.jetbrains.compose -private const val KOTLIN_COMPATABILITY_LINK = +private const val KOTLIN_COMPATIBILITY_LINK = "https://github.com/JetBrains/compose-jb/blob/master/VERSIONING.md#kotlin-compatibility" -internal object ComposeCompilerCompatability { +internal object ComposeCompilerCompatibility { private val kotlinToCompiler = sortedMapOf( "1.7.10" to "1.3.0", "1.7.20" to "1.3.2.2", @@ -13,7 +13,7 @@ internal object ComposeCompilerCompatability { return kotlinToCompiler[kotlinVersion] ?: throw RuntimeException( "This version of Compose Multiplatform doesn't support Kotlin " + "$kotlinVersion. " + - "Please see $KOTLIN_COMPATABILITY_LINK " + + "Please see $KOTLIN_COMPATIBILITY_LINK " + "to know the latest supported version of Kotlin." ) } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt index e1ce195041..2358409d53 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt @@ -22,7 +22,7 @@ class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin { composeCompilerArtifactProvider = ComposeCompilerArtifactProvider { composeExt.kotlinCompilerPlugin.orNull ?: - ComposeCompilerCompatability.compilerVersionFor(target.getKotlinPluginVersion()) + ComposeCompilerCompatibility.compilerVersionFor(target.getKotlinPluginVersion()) } } } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index 5e4a3a8079..fd69948933 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -142,7 +142,7 @@ class ComposePlugin : Plugin { class CompilerDependencies(private val project: Project) { fun forKotlin(version: String) = "org.jetbrains.compose.compiler:compiler:" + - ComposeCompilerCompatability.compilerVersionFor(version) + ComposeCompilerCompatibility.compilerVersionFor(version) /** * Compose Compiler that is chosen by the version of Kotlin applied to the Gradle project diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatabilityTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt similarity index 96% rename from gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatabilityTest.kt rename to gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt index dc396b5c26..7de0784cbc 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatabilityTest.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.compose.test.utils.TestProjects import org.jetbrains.compose.test.utils.checks import org.junit.jupiter.api.Test -class KotlinCompatabilityTest : GradlePluginTestBase() { +class KotlinCompatibilityTest : GradlePluginTestBase() { @Test fun testKotlinMpp_1_7_10() = testMpp("1.7.10")