From b3c1985d45557acb7c2a128f0ed22b3601edff30 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Apr 2021 02:12:25 +0530 Subject: [PATCH 1/4] Revert "gradle: update to 7.0 RC1" This reverts commit 1171fb17e6de9e057b165509cc9dfe36165bf8b0. --- buildSrc/src/main/java/BaseProjectConfig.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle.kts | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index e0c64831..307a8912 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 = "7.0-rc-1" + gradleVersion = "6.8.3" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6" + distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 79f1ffc3..6e61ea74 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=a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip +distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 9fcbcff4..9b14917b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ rootProject.name = "Claw" include(":app", ":api", ":common", ":database", ":desktop") +enableFeaturePreview("GRADLE_METADATA") pluginManagement { repositories { google() From 50598cc3e7149cc956f233a316fa0b7e53fc2a06 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Apr 2021 02:11:15 +0530 Subject: [PATCH 2/4] build: remove JCenter repository Signed-off-by: Harsh Shandilya --- buildSrc/src/main/java/BaseProjectConfig.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 307a8912..0576bf18 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -36,7 +36,6 @@ internal fun Project.configureForAllProjects() { repositories { google() mavenCentral() - jcenter { content { includeGroup("org.jetbrains.compose.*") } } maven("https://dl.bintray.com/kotlin/kotlinx") { name = "KotlinX Bintray" content { From b0d5f65dfe523ec6abf2844a9c1a6592fa8c8a36 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Apr 2021 02:16:23 +0530 Subject: [PATCH 3/4] build: bump AGP Signed-off-by: Harsh Shandilya --- buildSrc/src/main/java/Dependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 5b1a1147..5ba21a20 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -6,8 +6,8 @@ private const val DAGGER_HILT_VERSION = "2.33-beta" object Plugins { - const val android = "com.android.tools.build:gradle:7.0.0-alpha12" - const val lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha12" + 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 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" From ad6d023f468f1ef520bcb0df20dfa6ffff8474dd Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Apr 2021 02:25:34 +0530 Subject: [PATCH 4/4] common: remove unnecessary dependencies Signed-off-by: Harsh Shandilya --- common/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 43b2e3a0..1a44da4c 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -26,7 +26,6 @@ kotlin { sourceSets { val androidMain by getting { dependencies { - implementation(compose.runtime) implementation(Dependencies.AndroidX.browser) } } @@ -38,8 +37,6 @@ kotlin { } } - val jvmMain by getting { dependencies { implementation(compose.runtime) } } - val androidTest by getting { dependencies { implementation(kotlin("test-junit")) } } val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } }