Browse Source

Correct all occurrences of "compatability" (#2623)

pull/2634/head
Emre Şafak 2 years ago committed by GitHub
parent
commit
eba6b45df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 2
      VERSIONING.md
  3. 6
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
  4. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt
  5. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
  6. 2
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt

2
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) - [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 ### 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 - Fixes for Right-to-Left languages support
- [LayoutDirection is detected from the system settings](https://github.com/JetBrains/androidx/pull/264) - [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) - [Fix RTL selection in a multiline text](https://github.com/JetBrains/androidx/pull/285)

2
VERSIONING.md

@ -1,4 +1,4 @@
## Compatability and versioning overview ## Compatibility and versioning overview
### Supported platforms ### Supported platforms
* macOS (x86-64, arm64) * macOS (x86-64, arm64)

6
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt → gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt

@ -1,9 +1,9 @@
package org.jetbrains.compose 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" "https://github.com/JetBrains/compose-jb/blob/master/VERSIONING.md#kotlin-compatibility"
internal object ComposeCompilerCompatability { internal object ComposeCompilerCompatibility {
private val kotlinToCompiler = sortedMapOf( private val kotlinToCompiler = sortedMapOf(
"1.7.10" to "1.3.0", "1.7.10" to "1.3.0",
"1.7.20" to "1.3.2.2", "1.7.20" to "1.3.2.2",
@ -13,7 +13,7 @@ internal object ComposeCompilerCompatability {
return kotlinToCompiler[kotlinVersion] ?: throw RuntimeException( return kotlinToCompiler[kotlinVersion] ?: throw RuntimeException(
"This version of Compose Multiplatform doesn't support Kotlin " + "This version of Compose Multiplatform doesn't support Kotlin " +
"$kotlinVersion. " + "$kotlinVersion. " +
"Please see $KOTLIN_COMPATABILITY_LINK " + "Please see $KOTLIN_COMPATIBILITY_LINK " +
"to know the latest supported version of Kotlin." "to know the latest supported version of Kotlin."
) )
} }

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt

@ -22,7 +22,7 @@ class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin {
composeCompilerArtifactProvider = ComposeCompilerArtifactProvider { composeCompilerArtifactProvider = ComposeCompilerArtifactProvider {
composeExt.kotlinCompilerPlugin.orNull ?: composeExt.kotlinCompilerPlugin.orNull ?:
ComposeCompilerCompatability.compilerVersionFor(target.getKotlinPluginVersion()) ComposeCompilerCompatibility.compilerVersionFor(target.getKotlinPluginVersion())
} }
} }
} }

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

@ -142,7 +142,7 @@ class ComposePlugin : Plugin<Project> {
class CompilerDependencies(private val project: Project) { class CompilerDependencies(private val project: Project) {
fun forKotlin(version: String) = "org.jetbrains.compose.compiler:compiler:" + 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 * Compose Compiler that is chosen by the version of Kotlin applied to the Gradle project

2
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatabilityTest.kt → 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.jetbrains.compose.test.utils.checks
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
class KotlinCompatabilityTest : GradlePluginTestBase() { class KotlinCompatibilityTest : GradlePluginTestBase() {
@Test @Test
fun testKotlinMpp_1_7_10() = testMpp("1.7.10") fun testKotlinMpp_1_7_10() = testMpp("1.7.10")
Loading…
Cancel
Save