Skip to content

Commit fa8d26d

Browse files
koshachykoshachy
authored
chore: delete deprecated language and api versions (#4264)
1 parent 4e9aff1 commit fa8d26d

File tree

4 files changed

+25
-20
lines changed

4 files changed

+25
-20
lines changed

‎docs/topics/gradle/gradle-compiler-options.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ tasks.named('compileKotlin', KotlinCompilationTask) {
235235

236236
### Attributes common to JVM and JS
237237

238-
| Name | Description | Possible values |Default value |
239-
|------|-------------|-----------------|--------------|
240-
| `apiVersion` | Restrict the use of declarations to those from the specified version of bundled libraries | "1.4" (DEPRECATED), "1.5" (DEPRECATED), "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) | |
241-
| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.4" (DEPRECATED), "1.5" (DEPRECATED), "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) | |
238+
| Name | Description | Possible values | Default value |
239+
|-------------------|-------------------------------------------------------------------------------------------|---------------------------------------------------------|---------------|
240+
| `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) | |
241+
| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.6", "1.7", "1.8", "1.9", "2.0", "2.1" (EXPERIMENTAL) | |
242242

243243
#### Example of setting a languageVersion
244244

‎docs/topics/maven.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ Many of the options can also be configured through properties:
313313
```xml
314314
<project ...>
315315
<properties>
316-
<kotlin.compiler.languageVersion>1.9</kotlin.compiler.languageVersion>
316+
<kotlin.compiler.languageVersion>%languageVersion%</kotlin.compiler.languageVersion>
317317
</properties>
318318
</project>
319319
```
@@ -322,17 +322,17 @@ The following attributes are supported:
322322

323323
### Attributes specific to JVM
324324

325-
| Name | Property name | Description | Possible values | Default value |
326-
|-------------------|---------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------|
327-
| `nowarn` | | Generate no warnings | true, false | false |
328-
| `languageVersion` | kotlin.compiler.languageVersion | Provide source compatibility with the specified version of Kotlin | "1.3" (DEPRECATED), "1.4" (DEPRECATED), "1.5", "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) | |
329-
| `apiVersion` | kotlin.compiler.apiVersion | Allow using declarations only from the specified version of bundled libraries | "1.3" (DEPRECATED), "1.4" (DEPRECATED), "1.5", "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) | |
330-
| `sourceDirs` | | The directories containing the source files to compile | | The project source roots |
331-
| `compilerPlugins` | | Enabled compiler plugins | | [] |
332-
| `pluginOptions` | | Options for compiler plugins | | [] |
333-
| `args` | | Additional compiler arguments | | [] |
334-
| `jvmTarget` | `kotlin.compiler.jvmTarget` | Target version of the generated JVM bytecode | "1.8", "9", "10", ..., "22" | "%defaultJvmTargetVersion%" |
335-
| `jdkHome` | `kotlin.compiler.jdkHome` | Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME | | |
325+
| Name | Property name | Description | Possible values | Default value |
326+
|-------------------|---------------------------------|------------------------------------------------------------------------------------------------------|---------------------------------------------------------|-----------------------------|
327+
| `nowarn` | | Generate no warnings | true, false | false |
328+
| `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) | |
329+
| `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) | |
330+
| `sourceDirs` | | The directories containing the source files to compile | | The project source roots |
331+
| `compilerPlugins` | | Enabled compiler plugins | | [] |
332+
| `pluginOptions` | | Options for compiler plugins | | [] |
333+
| `args` | | Additional compiler arguments | | [] |
334+
| `jvmTarget` | `kotlin.compiler.jvmTarget` | Target version of the generated JVM bytecode | "1.8", "9", "10", ..., "22" | "%defaultJvmTargetVersion%" |
335+
| `jdkHome` | `kotlin.compiler.jdkHome` | Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME | | |
336336

337337
## Use BOM
338338

‎docs/topics/multiplatform/multiplatform-dsl-reference.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -855,8 +855,8 @@ The `languageSettings` block of a source set defines certain aspects of project
855855
kotlin {
856856
sourceSets.all {
857857
languageSettings.apply {
858-
languageVersion = "1.8" // possible values: "1.4", "1.5", "1.6", "1.7", "1.8", "1.9"
859-
apiVersion = "1.8" // possible values: "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9"
858+
languageVersion = "%languageVersion%" // possible values: '1.6', '1.7', '1.8', '1.9', `2.0`
859+
apiVersion = "%apiVersion%" // possible values: '1.6', '1.7', '1.8', '1.9', `2.0`
860860
enableLanguageFeature("InlineClasses") // language feature name
861861
optIn("kotlin.ExperimentalUnsignedTypes") // annotation FQ-name
862862
progressiveMode = true // false by default
@@ -872,8 +872,8 @@ kotlin {
872872
kotlin {
873873
sourceSets.all {
874874
languageSettings {
875-
languageVersion = '1.8' // possible values: '1.4', '1.5', '1.6', '1.7', '1.8', '1.9'
876-
apiVersion = '1.8' // possible values: '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9'
875+
languageVersion = '%languageVersion%' // possible values: '1.6', '1.7', '1.8', '1.9', `2.0`
876+
apiVersion = '%apiVersion%' // possible values: '1.6', '1.7', '1.8', '1.9', `2.0`
877877
enableLanguageFeature('InlineClasses') // language feature name
878878
optIn('kotlin.ExperimentalUnsignedTypes') // annotation FQ-name
879879
progressiveMode = true // false by default

‎docs/v.list

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,9 @@
5454

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

57+
<var name="languageVersion" value="2.0" type="string"/>
58+
59+
<var name="apiVersion" value="2.0" type="string"/>
60+
61+
5762
</vars>

0 commit comments

Comments
 (0)