From 1171fb17e6de9e057b165509cc9dfe36165bf8b0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 23 Mar 2021 12:41:10 +0530 Subject: [PATCH 1/2] gradle: update to 7.0 RC1 Signed-off-by: Harsh Shandilya --- buildSrc/src/main/java/BaseProjectConfig.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 6bede5ad..066e0af0 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -27,9 +27,9 @@ internal fun Project.configureForRootProject() { delete(rootProject.buildDir) } tasks.withType { - gradleVersion = "6.8.3" + gradleVersion = "7.0-rc-1" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7" + distributionSha256Sum = "a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e61ea74..b4ba05aa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c8c8040..f149a702 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,5 @@ rootProject.name = "Claw" include(":app", ":api", ":common", ":database", ":desktop") -enableFeaturePreview("GRADLE_METADATA") pluginManagement { repositories { google() From ff3b4c7a2766333e02539f6f63ac537c41f3d58e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 29 Mar 2021 04:20:14 +0530 Subject: [PATCH 2/2] api: update KSP for Gradle 7.0-RC1 support Signed-off-by: Harsh Shandilya --- api/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 16e5df8d..67d96d88 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") - id("com.google.devtools.ksp") version "1.4.30-1.0.0-alpha05" + id("com.google.devtools.ksp") version "1.4.31-1.0.0-alpha06" `lobsters-plugin` }