From a381d3d1ed557ef2dfd32b7b6ebae7b69b1d0a67 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 28 Jun 2022 16:55:26 +0530 Subject: [PATCH] build: apply gradle cache fix plugin --- build-logic/android-plugins/build.gradle.kts | 5 ++++- .../dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt | 3 +++ build-logic/settings.gradle.kts | 6 +++++- gradle.properties | 3 +++ gradle/libs.versions.toml | 1 + settings.gradle.kts | 13 ++++++++++++- 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts index 14c32daf..2586ab4f 100644 --- a/build-logic/android-plugins/build.gradle.kts +++ b/build-logic/android-plugins/build.gradle.kts @@ -45,4 +45,7 @@ gradlePlugin { } } -dependencies { implementation(libs.build.agp) } +dependencies { + implementation(libs.build.agp) + implementation(libs.build.cachefix) +} diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt index e8452a95..12989a8e 100644 --- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt +++ b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt @@ -2,14 +2,17 @@ package dev.msfjarvis.aps.gradle import com.android.build.api.dsl.TestExtension import com.android.build.gradle.TestedExtension +import org.gradle.android.AndroidCacheFixPlugin import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.findByType @Suppress("UnstableApiUsage") class AndroidCommonPlugin : Plugin { override fun apply(project: Project) { + project.pluginManager.apply(AndroidCacheFixPlugin::class) project.extensions.findByType()?.run { setCompileSdkVersion(31) defaultConfig { diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index c8615df3..9874f0c7 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -27,7 +27,11 @@ dependencyResolutionManagement { } exclusiveContent { forRepository(::gradlePluginPortal) - filter { includeModule("com.github.ben-manes", "gradle-versions-plugin") } + filter { + includeModule("com.github.ben-manes", "gradle-versions-plugin") + includeModule("org.gradle.android.cache-fix", "org.gradle.android.cache-fix.gradle.plugin") + includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") + } } mavenCentral() } diff --git a/gradle.properties b/gradle.properties index 855103d0..8783aebb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,9 @@ org.gradle.caching=true # Enable filesystem watching org.gradle.vfs.watch=true +# Disable cache-fix version warning +org.gradle.android.cache-fix.ignoreVersionCheck=true + # Enable experimental configuration caching org.gradle.unsafe.configuration-cache=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 88630fe8..ff5deab4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,6 +39,7 @@ aurora-component = { module = "org.pushing-pixels:aurora-component", version.ref aurora-theming = { module = "org.pushing-pixels:aurora-theming", version.ref = "aurora" } aurora-window = { module = "org.pushing-pixels:aurora-window", version.ref = "aurora" } build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } +build-cachefix = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:2.5.5" build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } build-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.7.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index 13f53a8a..8b45c1f0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,7 +26,11 @@ pluginManagement { } exclusiveContent { forRepository(::gradlePluginPortal) - filter { includeModule("com.github.ben-manes", "gradle-versions-plugin") } + filter { + includeModule("com.github.ben-manes", "gradle-versions-plugin") + includeModule("org.gradle.android.cache-fix", "org.gradle.android.cache-fix.gradle.plugin") + includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") + } } includeBuild("build-logic") mavenCentral() @@ -63,6 +67,13 @@ dependencyResolutionManagement { includeGroup("org.jetbrains.skiko") } } + exclusiveContent { + forRepository(::gradlePluginPortal) + filter { + includeModule("org.gradle.android.cache-fix", "org.gradle.android.cache-fix.gradle.plugin") + includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") + } + } mavenCentral() } }