Apply cache-fix plugin from convention plugins

chrisbanes · May 16, 2023 · 174e4fe · 174e4fe
1 parent efbe3e4
commit 174e4fe
Show file tree

Hide file tree

Showing 48 changed files with 3 additions and 45 deletions.
diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 plugins {
     id("app.tivi.android.application")
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/api/tmdb/build.gradle.kts b/api/tmdb/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     alias(libs.plugins.ksp)
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 kotlin {

diff --git a/api/trakt/build.gradle.kts b/api/trakt/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     alias(libs.plugins.ksp)
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 kotlin {

diff --git a/common/imageloading/build.gradle.kts b/common/imageloading/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/common/ui/compose/build.gradle.kts b/common/ui/compose/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
 }
 

diff --git a/common/ui/resources-compose/build.gradle.kts b/common/ui/resources-compose/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
 }
 

diff --git a/common/ui/resources/build.gradle.kts b/common/ui/resources/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     id("app.tivi.android.library")
     alias(libs.plugins.moko.resources) // needs to be enabled after AGP
 }

diff --git a/common/ui/view/build.gradle.kts b/common/ui/view/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
 }
 

diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/core/logging/build.gradle.kts b/core/logging/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/core/performance/build.gradle.kts b/core/performance/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/core/powercontroller/build.gradle.kts b/core/powercontroller/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/db-sqldelight/build.gradle.kts b/data/db-sqldelight/build.gradle.kts
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
     alias(libs.plugins.sqldelight)
 }

diff --git a/data/db/build.gradle.kts b/data/db/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 kotlin {

diff --git a/data/episodes/build.gradle.kts b/data/episodes/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/followedshows/build.gradle.kts b/data/followedshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/legacy/build.gradle.kts b/data/legacy/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/models/build.gradle.kts b/data/models/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 kotlin {

diff --git a/data/popularshows/build.gradle.kts b/data/popularshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/recommendedshows/build.gradle.kts b/data/recommendedshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/relatedshows/build.gradle.kts b/data/relatedshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/search/build.gradle.kts b/data/search/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/showimages/build.gradle.kts b/data/showimages/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/shows/build.gradle.kts b/data/shows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/test/build.gradle.kts b/data/test/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/traktauth/build.gradle.kts b/data/traktauth/build.gradle.kts
@@ -36,7 +36,6 @@ import org.gradle.android.Versions.android
 plugins {
     id("app.tivi.multiplatform")
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/traktusers/build.gradle.kts b/data/traktusers/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/trendingshows/build.gradle.kts b/data/trendingshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/data/watchedshows/build.gradle.kts b/data/watchedshows/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.ksp)
 }
 

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     id("app.tivi.multiplatform")
     alias(libs.plugins.ksp)
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 // https://github.com/cashapp/multiplatform-paging/issues/6

diff --git a/...uild-logic/convention/src/main/java/app/tivi/gradle/AndroidApplicationConventionPlugin.kt b/...uild-logic/convention/src/main/java/app/tivi/gradle/AndroidApplicationConventionPlugin.kt
@@ -24,6 +24,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
+                apply("org.gradle.android.cache-fix")
             }
         }
     }

diff --git a/...le/build-logic/convention/src/main/java/app/tivi/gradle/AndroidLibraryConventionPlugin.kt b/...le/build-logic/convention/src/main/java/app/tivi/gradle/AndroidLibraryConventionPlugin.kt
@@ -24,6 +24,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
+                apply("org.gradle.android.cache-fix")
             }
         }
     }

diff --git a/...ild-logic/convention/src/main/java/app/tivi/gradle/KotlinMultiplatformConventionPlugin.kt b/...ild-logic/convention/src/main/java/app/tivi/gradle/KotlinMultiplatformConventionPlugin.kt
@@ -24,6 +24,7 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("org.jetbrains.kotlin.multiplatform")
+                apply("org.gradle.android.cache-fix")
             }
         }
     }

diff --git a/tasks/android/build.gradle.kts b/tasks/android/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/tasks/api/build.gradle.kts b/tasks/api/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.multiplatform")
-    alias(libs.plugins.cacheFixPlugin)
 }
 
 kotlin {

diff --git a/ui/account/build.gradle.kts b/ui/account/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/discover/build.gradle.kts b/ui/discover/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/episode/details/build.gradle.kts b/ui/episode/details/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/episode/track/build.gradle.kts b/ui/episode/track/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/library/build.gradle.kts b/ui/library/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/popular/build.gradle.kts b/ui/popular/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/recommended/build.gradle.kts b/ui/recommended/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/search/build.gradle.kts b/ui/search/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/settings/build.gradle.kts b/ui/settings/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/show/details/build.gradle.kts b/ui/show/details/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/show/seasons/build.gradle.kts b/ui/show/seasons/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }

diff --git a/ui/trending/build.gradle.kts b/ui/trending/build.gradle.kts
@@ -17,7 +17,6 @@
 
 plugins {
     id("app.tivi.android.library")
-    alias(libs.plugins.cacheFixPlugin)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }