From 19248c3a30fc7741ea0f30a6b7cec70a9fc37c13 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 10 Apr 2021 21:08:11 +0530 Subject: [PATCH 1/4] build: bump to Gradle 7.0 Signed-off-by: Harsh Shandilya --- buildSrc/src/main/java/BaseProjectConfig.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle.kts | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 0576bf18..46e12f7c 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -25,9 +25,9 @@ internal fun Project.configureForRootProject() { // register task for cleaning the build directory in the root project tasks.register("clean") { delete(rootProject.buildDir) } tasks.withType { - gradleVersion = "6.8.3" + gradleVersion = "7.0" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7" + distributionSha256Sum = "81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e61ea74..9d174797 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 +distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 9b14917b..2215a6a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,11 @@ rootProject.name = "Claw" -include(":app", ":api", ":common", ":database", ":desktop") +include(":api") +include(":app") +include(":common") +include(":database") +include(":desktop") -enableFeaturePreview("GRADLE_METADATA") pluginManagement { repositories { google() From de0d7b28f838993b83737476f295c1ec612d7494 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 10 Apr 2021 21:19:21 +0530 Subject: [PATCH 2/4] desktop: fix compat with Gradle 7.0 Signed-off-by: Harsh Shandilya --- desktop/build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 5d071aa5..eeeb3e38 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -10,9 +10,7 @@ plugins { repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } kotlin { - jvm { - withJava() - } + jvm() sourceSets { named("jvmMain") { dependencies { From 789dae907a4937bc9c806984e22401b40fac5c26 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 10 Apr 2021 21:20:44 +0530 Subject: [PATCH 3/4] build: use typesafe project accessors preview feature Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 6 +++--- desktop/build.gradle.kts | 6 +++--- settings.gradle.kts | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7f87eda8..0599167c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,9 +21,9 @@ android { dependencies { kapt(Dependencies.AndroidX.Hilt.daggerCompiler) - implementation(project(":api")) - implementation(project(":common")) - implementation(project(":database")) + implementation(projects.api) + implementation(projects.common) + implementation(projects.database) implementation(compose.foundation) implementation(compose.material) implementation(Dependencies.AndroidX.appCompat) diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index eeeb3e38..3a5380ac 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -15,9 +15,9 @@ kotlin { named("jvmMain") { dependencies { implementation(compose.desktop.currentOs) - implementation(project(":api")) - implementation(project(":common")) - implementation(project(":database")) + implementation(projects.api) + implementation(projects.common) + implementation(projects.database) implementation(compose.material) implementation(Dependencies.Kotlin.Coroutines.jvmCore) implementation(Dependencies.ThirdParty.kamel) diff --git a/settings.gradle.kts b/settings.gradle.kts index 2215a6a2..d58439c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,8 @@ include(":common") include(":database") include(":desktop") +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + pluginManagement { repositories { google() From e44b743016ad0387f63b0918477ad9ec2d16ed96 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 10 Apr 2021 21:22:08 +0530 Subject: [PATCH 4/4] build: bump AGP and remove unused lint dependency Signed-off-by: Harsh Shandilya --- buildSrc/build.gradle.kts | 1 - buildSrc/src/main/java/Dependencies.kt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 59eeef3d..b55ecea0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { implementation(Plugins.android) implementation(Plugins.hilt) implementation(Plugins.jsemver) - implementation(Plugins.lintModel) implementation(Plugins.kotlin) implementation(Plugins.shot) implementation(Plugins.sqldelight) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index f92f62d7..00ef5693 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -6,8 +6,7 @@ private const val DAGGER_HILT_VERSION = "2.34-beta" object Plugins { - const val android = "com.android.tools.build:gradle:7.0.0-alpha13" - const val lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha13" + const val android = "com.android.tools.build:gradle:7.0.0-alpha14" const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0"