From 8c2561e6f377c3bef1e4bad978c7995dd2e7494e Mon Sep 17 00:00:00 2001 From: Alejandro Serrano Date: Wed, 20 Dec 2023 12:37:11 +0100 Subject: [PATCH 1/2] Run K2 using 2.0.0-Beta2 --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b3cdc4ae749..51ad0453618 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -179,7 +179,7 @@ jobs: - name: jvmTest (K2 enabled) uses: gradle/gradle-build-action@v2 with: - arguments: "jvmTest -Pkotlin_version=2.0.0-dev-7674 -Pkotlin_repo_url=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap -Pkotlin_language_version=2.0 -Pkotlin_api_version=2.0" + arguments: "jvmTest -Pkotlin_version=2.0.0-Beta2 -Pkotlin_language_version=2.0 -Pkotlin_api_version=2.0" - name: Upload reports if: failure() From b08b1891dd38ef6918746f9af5a64d3240dbe4ac Mon Sep 17 00:00:00 2001 From: Alejandro Serrano Mena Date: Wed, 20 Dec 2023 12:40:34 +0100 Subject: [PATCH 2/2] Also use correct KSP version --- .github/workflows/pull_request.yml | 2 +- settings.gradle.kts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 51ad0453618..acd6aa39d25 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -179,7 +179,7 @@ jobs: - name: jvmTest (K2 enabled) uses: gradle/gradle-build-action@v2 with: - arguments: "jvmTest -Pkotlin_version=2.0.0-Beta2 -Pkotlin_language_version=2.0 -Pkotlin_api_version=2.0" + arguments: "jvmTest -Pkotlin_version=2.0.0-Beta2 -Pksp_version=2.0.0-Beta2-1.0.16 -Pkotlin_language_version=2.0 -Pkotlin_api_version=2.0" - name: Upload reports if: failure() diff --git a/settings.gradle.kts b/settings.gradle.kts index 3b83b13ea4e..5344f40a3bb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencyResolutionManagement { @Suppress("LocalVariableName") val kotlin_repo_url: String? by settings @Suppress("LocalVariableName") val kotlin_version: String? by settings + @Suppress("LocalVariableName") val ksp_version: String? by settings repositories { mavenCentral() @@ -33,6 +34,10 @@ dependencyResolutionManagement { println("Overriding Kotlin version with $kotlin_version") version("kotlin", kotlin_version!!) } + if (!ksp_version.isNullOrBlank()) { + println("Overriding KSP version with $ksp_version") + version("kspVersion", ksp_version!!) + } } } }