Skip to content

Commit

Permalink
Update Kotlin to 1.8.10 (#2797)
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnatBeresnev authored Feb 10, 2023
1 parent a5a20cd commit f09b149
Show file tree
Hide file tree
Showing 41 changed files with 225 additions and 91 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.dokka.base.DokkaBase
import org.jetbrains.dokka.base.DokkaBaseConfiguration

plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version ("1.7.20")
}

Expand Down
2 changes: 1 addition & 1 deletion examples/gradle/dokka-gradle-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import java.net.URL

plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version ("1.7.20")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version ("1.7.20")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version ("1.7.20")
`java-library`
`maven-publish`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kotlinVersion=1.7.20
kotlinVersion=1.8.10
dokkaVersion=1.7.20
4 changes: 2 additions & 2 deletions examples/gradle/dokka-multiplatform-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.dokka.Platform

plugins {
kotlin("multiplatform") version "1.7.20"
kotlin("multiplatform") version "1.8.10"
id("org.jetbrains.dokka") version "1.7.20"
}

Expand All @@ -19,7 +19,7 @@ kotlin {
jvm() // Creates a JVM target with the default name "jvm"
linuxX64("linux")
macosX64("macos")
js()
js(BOTH)
sourceSets {
val commonMain by getting {
dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version ("1.7.20") apply false
}

Expand Down
2 changes: 1 addition & 1 deletion examples/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>kotlin-maven-example</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.version>1.8.10</kotlin.version>
<dokka.version>1.7.20</dokka.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/hide-internal-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI

plugins {
kotlin("jvm") version "1.7.20"
kotlin("jvm") version "1.8.10"
id("org.jetbrains.dokka") version "1.7.20"
`maven-publish`
signing
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
dokka_version=1.8.0-SNAPSHOT
dokka_integration_test_parallelism=2
# Versions
kotlin_version=1.7.20
kotlin_version=1.8.10
coroutines_version=1.6.3
kotlinx_html_version=0.7.5
kotlin_plugin_version=213-1.7.20-199-IJ6777.52
kotlin_plugin_version=213-1.8.10-release-430-IJ6777.52
jsoup_version=1.15.3
idea_version=213.6777.52
language_version=1.4
Expand Down
58 changes: 28 additions & 30 deletions integration-tests/gradle/projects/coroutines/coroutines.diff
Original file line number Diff line number Diff line change
@@ -1,62 +1,60 @@
diff --git a/build.gradle b/build.gradle
index ba6d5c18c..bd31bca29 100644
index 934d4c220..38321990e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,6 +125,7 @@ allprojects {
* transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution
*/
@@ -131,6 +131,7 @@ allprojects {
google()
+ mavenLocal()
mavenCentral()
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
+ mavenLocal()
}
}

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index eaa03f2f1..deae8d40d 100644
index 785d13fdb..7fb19f467 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -19,6 +19,7 @@ repositories {
maven("https://plugins.gradle.org/m2")
}
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+ mavenLocal()
@@ -25,6 +25,7 @@ repositories {
if (buildSnapshotTrain) {
mavenLocal()
}
+ mavenLocal()
}

kotlinDslPluginOptions {
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index c2e859f65..80163ff95 100644
index c2e859f65..43dc4f749 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -4,6 +4,7 @@
pluginManagement {
val build_snapshot_train: String? by settings
repositories {
@@ -14,5 +14,6 @@ pluginManagement {
if (build_snapshot_train?.toBoolean() == true) {
mavenLocal()
}
+ mavenLocal()
val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
if (cacheRedirectorEnabled) {
println("Redirecting repositories for buildSrc buildscript")
}
}
diff --git a/gradle.properties b/gradle.properties
index e452a07ee..471285c20 100644
index db7cf099b..9c13c46fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ atomicfu_version=0.17.3
@@ -14,7 +14,7 @@ atomicfu_version=0.18.5
knit_version=0.4.0
html_version=0.7.2
lincheck_version=2.14
-dokka_version=1.6.21
lincheck_version=2.14.1
-dokka_version=1.7.20
+dokka_version=for-integration-tests-SNAPSHOT
byte_buddy_version=1.10.9
reactor_version=3.4.1
reactive_streams_version=1.0.3
diff --git a/settings.gradle b/settings.gradle
index f0a764898..1cc45fdf6 100644
index 151c087fd..e578bdb93 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
}

@@ -11,6 +11,7 @@ pluginManagement {
repositories {
- maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
+ mavenLocal()
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
gradlePluginPortal()
+ mavenLocal()
}
}

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
dokka_it_android_gradle_plugin_version=4.0.0
android.useAndroidX=true
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.20
react_version=18.1.0-pre.345
dokka_it_kotlin_version=1.8.10
react_version=18.2.0-pre.467
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ kotlin {
jvm()
linuxX64("linux")
macosX64("macos")
js()
js(BOTH)
//TODO Add wasm when kx.coroutines will be supported and published into the main repo
sourceSets {
val commonMain by sourceSets.getting
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
#these flags are enabled by default since 1.6.20.
#remove when this test is executed with Kotlin >= 1.6.20
kotlin.mpp.enableGranularSourceSetsMetadata=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.20
task_number=100
dokka_it_kotlin_version=1.8.10
task_number=100
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20
dokka_it_kotlin_version=1.8.10
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class BasicCachingIntegrationTest(override val versions: BuildVersions) : Abstra
companion object {
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
companion object {
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Collector0IntegrationTest(override val versions: BuildVersions) : Abstract
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class GradleRelocatedCachingIntegrationTest(override val versions: BuildVersions
companion object {
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract
companion object {
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

private val ignoredKotlinVersions = setOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MultiModule1IntegrationTest(override val versions: BuildVersions) : Abstra
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions)
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,29 @@ package org.jetbrains.dokka.it.gradle

internal object TestedVersions {

val LATEST = BuildVersions("7.4.2", "1.7.20")
val BASE =
val LATEST = BuildVersions("7.4.2", "1.8.10")

/**
* All supported Gradle/Kotlin versions, including [LATEST]
*
* [Kotlin/Gradle compatibility matrix](https://docs.gradle.org/current/userguide/compatibility.html#kotlin)
*/
val ALL_SUPPORTED =
BuildVersions.permutations(
gradleVersions = listOf("7.4.2", "6.9"),
gradleVersions = listOf("6.9"),
kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"),
) + BuildVersions.permutations(
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0"))
)
kotlinVersions = listOf(*ifExhaustive("1.7.0", "1.6.0", "1.5.0", "1.4.0"))
) + LATEST

/**
* Starting with version 7, major android gradle plugin versions are aligned
* with major gradle versions, i.e android plugin 7.0.0 will not work with gradle 6.9
* Supported Android/Gradle/Kotlin versions, including [LATEST]
*
* Starting with version 7, major Android Gradle Plugin versions are aligned
* with major Gradle versions, i.e AGP 7.X will only work with Gradle 7.X
*
* [AGP/Gradle compatibility matrix](https://developer.android.com/studio/releases/gradle-plugin#updating-gradle)
*/
val ANDROID =
BuildVersions.permutations(
Expand All @@ -23,9 +33,9 @@ internal object TestedVersions {
androidGradlePluginVersions = listOf("7.2.0")
) + BuildVersions.permutations(
gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")),
kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"),
kotlinVersions = listOf("1.8.0", "1.7.0", "1.6.0", "1.5.0", "1.4.0"),
androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3"))
)
) + LATEST

// https://mvnrepository.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-react
val KT_REACT_WRAPPER_MAPPING = mapOf(
Expand All @@ -34,5 +44,7 @@ internal object TestedVersions {
"1.5.31" to "17.0.2-pre.265-kotlin-1.5.31",
"1.6.21" to "18.0.0-pre.332-kotlin-1.6.21",
"1.7.20" to "18.2.0-pre.391",
"1.8.0" to "18.2.0-pre.467",
"1.8.10" to "18.2.0-pre.490",
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac
companion object {
@get:JvmStatic
@get:Parameterized.Parameters(name = "{0}")
val versions = TestedVersions.BASE
val versions = TestedVersions.ALL_SUPPORTED
}

@BeforeTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CoroutinesGradleIntegrationTest(override val versions: BuildVersions) : Ab
@get:Parameterized.Parameters(name = "{0}")
val versions = BuildVersions.permutations(
gradleVersions = listOf("7.4.2"),
kotlinVersions = listOf("1.7.10")
kotlinVersions = listOf("1.8.10")
)
}

Expand Down
Loading

0 comments on commit f09b149

Please sign in to comment.