From ea556775f9532f1010979f45e34d0dc29f7702dd Mon Sep 17 00:00:00 2001 From: Sarah Haggarty Date: Fri, 25 Oct 2024 10:14:25 +0200 Subject: [PATCH] chore: update Gradle versions for 2.1.0 --- docs/topics/gradle/gradle-compiler-options.md | 16 +++++++------- .../topics/gradle/gradle-configure-project.md | 7 +++--- docs/topics/maven.md | 22 +++++++++---------- .../multiplatform-dsl-reference.md | 8 +++---- docs/v.list | 8 +++---- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/docs/topics/gradle/gradle-compiler-options.md b/docs/topics/gradle/gradle-compiler-options.md index 91d79ecbfb7..56664217f45 100644 --- a/docs/topics/gradle/gradle-compiler-options.md +++ b/docs/topics/gradle/gradle-compiler-options.md @@ -177,14 +177,14 @@ Here is a complete list of options for Gradle tasks: ### Attributes common to JVM and JS -| Name | Description | Possible values |Default value | -|------|-------------|-----------------|--------------| -| `allWarningsAsErrors` | Report an error if there are any warnings | | false | -| `suppressWarnings` | Don't generate warnings | | false | -| `verbose` | Enable verbose logging output. Works only when the [Gradle debug log level enabled](https://docs.gradle.org/current/userguide/logging.html) | | false | -| `freeCompilerArgs` | A list of additional compiler arguments. You can use experimental `-X` arguments here too. See an [example](#example-of-additional-arguments-usage-via-freecompilerargs) | | [] | -| `apiVersion` | Restrict the use of declarations to those from the specified version of bundled libraries | "1.6", "1.7", "1.8", "1.9", "2.0", "2.1" (EXPERIMENTAL) | | -| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.6", "1.7", "1.8", "1.9", "2.0", "2.1" (EXPERIMENTAL) | | +| Name | Description | Possible values |Default value | +|------|-------------|----------------------------------------------------------------|--------------| +| `allWarningsAsErrors` | Report an error if there are any warnings | | false | +| `suppressWarnings` | Don't generate warnings | | false | +| `verbose` | Enable verbose logging output. Works only when the [Gradle debug log level enabled](https://docs.gradle.org/current/userguide/logging.html) | | false | +| `freeCompilerArgs` | A list of additional compiler arguments. You can use experimental `-X` arguments here too. See an [example](#example-of-additional-arguments-usage-via-freecompilerargs) | | [] | +| `apiVersion` | Restrict the use of declarations to those from the specified version of bundled libraries | "1.8", "1.9", "2.0", "2.1", "2.2" (EXPERIMENTAL) | | +| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.8", "1.9", "2.0", "2.1", "2.2" (EXPERIMENTAL) | | > We are going to deprecate the attribute `freeCompilerArgs` in future releases. If you miss some option in the Kotlin Gradle DSL, diff --git a/docs/topics/gradle/gradle-configure-project.md b/docs/topics/gradle/gradle-configure-project.md index 016b8f020dc..391668f4752 100644 --- a/docs/topics/gradle/gradle-configure-project.md +++ b/docs/topics/gradle/gradle-configure-project.md @@ -50,7 +50,8 @@ In the following table, there are the minimum and maximum **fully supported** ve | KGP version | Gradle min and max versions | AGP min and max versions | |---------------|----------------------------------------|-----------------------------------------------------| -| 2.0.20 | %minGradleVersion%–%maxGradleVersion%* | %minAndroidGradleVersion%–%maxAndroidGradleVersion% | +| 2.1.0 | %minGradleVersion%–%maxGradleVersion%* | %minAndroidGradleVersion%–%maxAndroidGradleVersion% | +| 2.0.20–2.0.21 | 6.8.3–8.8* | 7.1.3–8.5 | | 2.0.0 | 6.8.3–8.5 | 7.1.3–8.3.1 | | 1.9.20–1.9.25 | 6.8.3–8.1.1 | 4.2.2–8.1.0 | | 1.9.0–1.9.10 | 6.8.3–7.6.0 | 4.2.2–7.4.0 | @@ -60,8 +61,8 @@ In the following table, there are the minimum and maximum **fully supported** ve | 1.7.0–1.7.10 | 6.7.1–7.0.2 | 3.4.3–7.0.2 | | 1.6.20–1.6.21 | 6.1.1–7.0.2 | 3.4.3–7.0.2 | -> *Kotlin 2.0.20 is fully compatible with Gradle 6.8.3 through 8.6. -> Gradle 8.7 and 8.8 are also supported, with only one exception: If you use the Kotlin Multiplatform Gradle plugin, +> *Kotlin 2.0.20–2.0.21 and Kotlin 2.1.0 are fully compatible with Gradle up to 8.6. +> Gradle versions 8.7–8.10 are also supported, with only one exception: If you use the Kotlin Multiplatform Gradle plugin, > you may see deprecation warnings in your multiplatform projects calling the [`withJava()` function in the JVM target](multiplatform-dsl-reference.md#jvm-targets). > For more information, see the issue in [YouTrack](https://youtrack.jetbrains.com/issue/KT-66542/Gradle-JVM-target-with-withJava-produces-a-deprecation-warning). > diff --git a/docs/topics/maven.md b/docs/topics/maven.md index 12832283f21..8df129b8e23 100644 --- a/docs/topics/maven.md +++ b/docs/topics/maven.md @@ -322,17 +322,17 @@ The following attributes are supported: ### Attributes specific to JVM -| Name | Property name | Description | Possible values | Default value | -|-------------------|---------------------------------|------------------------------------------------------------------------------------------------------|---------------------------------------------------------|-----------------------------| -| `nowarn` | | Generate no warnings | true, false | false | -| `languageVersion` | kotlin.compiler.languageVersion | Provide source compatibility with the specified version of Kotlin | "1.6", "1.7", "1.8", "1.9", "2.0", "2.1" (EXPERIMENTAL) | | -| `apiVersion` | kotlin.compiler.apiVersion | Allow using declarations only from the specified version of bundled libraries | "1.6", "1.7", "1.8", "1.9", "2.0", "2.1" (EXPERIMENTAL) | | -| `sourceDirs` | | The directories containing the source files to compile | | The project source roots | -| `compilerPlugins` | | Enabled compiler plugins | | [] | -| `pluginOptions` | | Options for compiler plugins | | [] | -| `args` | | Additional compiler arguments | | [] | -| `jvmTarget` | `kotlin.compiler.jvmTarget` | Target version of the generated JVM bytecode | "1.8", "9", "10", ..., "22" | "%defaultJvmTargetVersion%" | -| `jdkHome` | `kotlin.compiler.jdkHome` | Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME | | | +| Name | Property name | Description | Possible values | Default value | +|-------------------|---------------------------------|------------------------------------------------------------------------------------------------------|--------------------------------------------------|-----------------------------| +| `nowarn` | | Generate no warnings | true, false | false | +| `languageVersion` | kotlin.compiler.languageVersion | Provide source compatibility with the specified version of Kotlin | "1.8", "1.9", "2.0", "2.1", "2.2" (EXPERIMENTAL) | | +| `apiVersion` | kotlin.compiler.apiVersion | Allow using declarations only from the specified version of bundled libraries | "1.8", "1.9", "2.0", "2.1", "2.2" (EXPERIMENTAL) | | +| `sourceDirs` | | The directories containing the source files to compile | | The project source roots | +| `compilerPlugins` | | Enabled compiler plugins | | [] | +| `pluginOptions` | | Options for compiler plugins | | [] | +| `args` | | Additional compiler arguments | | [] | +| `jvmTarget` | `kotlin.compiler.jvmTarget` | Target version of the generated JVM bytecode | "1.8", "9", "10", ..., "22" | "%defaultJvmTargetVersion%" | +| `jdkHome` | `kotlin.compiler.jdkHome` | Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME | | | ## Use BOM diff --git a/docs/topics/multiplatform/multiplatform-dsl-reference.md b/docs/topics/multiplatform/multiplatform-dsl-reference.md index 7308190d1d2..9320d43e89e 100644 --- a/docs/topics/multiplatform/multiplatform-dsl-reference.md +++ b/docs/topics/multiplatform/multiplatform-dsl-reference.md @@ -941,8 +941,8 @@ The `languageSettings {}` block of a source set defines certain aspects of proje kotlin { sourceSets.all { languageSettings.apply { - languageVersion = "%languageVersion%" // possible values: '1.6', '1.7', '1.8', '1.9', `2.0` - apiVersion = "%apiVersion%" // possible values: '1.6', '1.7', '1.8', '1.9', `2.0` + languageVersion = "%languageVersion%" // possible values: '1.8', '1.9', `2.0`, `2.1` + apiVersion = "%apiVersion%" // possible values: '1.8', '1.9', `2.0`, `2.1` enableLanguageFeature("InlineClasses") // language feature name optIn("kotlin.ExperimentalUnsignedTypes") // annotation FQ-name progressiveMode = true // false by default @@ -958,8 +958,8 @@ kotlin { kotlin { sourceSets.all { languageSettings { - languageVersion = '%languageVersion%' // possible values: '1.6', '1.7', '1.8', '1.9', `2.0` - apiVersion = '%apiVersion%' // possible values: '1.6', '1.7', '1.8', '1.9', `2.0` + languageVersion = '%languageVersion%' // possible values: '1.8', '1.9', `2.0`, `2.1` + apiVersion = '%apiVersion%' // possible values: '1.8', '1.9', `2.0`, `2.1` enableLanguageFeature('InlineClasses') // language feature name optIn('kotlin.ExperimentalUnsignedTypes') // annotation FQ-name progressiveMode = true // false by default diff --git a/docs/v.list b/docs/v.list index 11a394613c0..7ef7e7c75bc 100644 --- a/docs/v.list +++ b/docs/v.list @@ -31,13 +31,13 @@ - - + + - + - +