Skip to content

Commit

Permalink
chore: update Gradle versions for 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahhaggarty committed Oct 29, 2024
1 parent b2821a5 commit 93ef1c0
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 32 deletions.
16 changes: 8 additions & 8 deletions docs/topics/gradle/gradle-compiler-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions docs/topics/gradle/gradle-configure-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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).
>
Expand Down
22 changes: 11 additions & 11 deletions docs/topics/maven.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions docs/topics/multiplatform/multiplatform-dsl-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,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
Expand All @@ -948,8 +948,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
Expand Down
12 changes: 6 additions & 6 deletions docs/v.list
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

<var name="coroutinesEapVersion" value="1.9.0-RC.2" type="string"/>

<var name="minGradleVersion" value="6.8.3" type="string"/>
<var name="minGradleVersion" value="7.6.3" type="string"/>

<var name="maxGradleVersion" value="8.8" type="string"/>
<var name="maxGradleVersion" value="8.10" type="string"/>

<var name="minAndroidGradleVersion" value="7.1.3" type="string"/>
<var name="minAndroidGradleVersion" value="7.3.1" type="string"/>

<var name="maxAndroidGradleVersion" value="8.5" type="string"/>

<var name="gradleVersion" value="8.5" type="string"/>
<var name="gradleVersion" value="8.10" type="string"/>

<var name="gradleLanguageVersion" value="KOTLIN_2_0" type="string"/>

Expand Down Expand Up @@ -54,9 +54,9 @@

<var name="foojayResolver" value="0.5.0" type="string"/>

<var name="languageVersion" value="2.0" type="string"/>
<var name="languageVersion" value="2.1" type="string"/>

<var name="apiVersion" value="2.0" type="string"/>
<var name="apiVersion" value="2.1" type="string"/>

<var name="lincheckVersion" value="2.34" type="string"/>
<var name="jctoolsVersion" value="3.3.0" type="string"/>
Expand Down

0 comments on commit 93ef1c0

Please sign in to comment.