Skip to content

Commit

Permalink
android: Remove dependency on android-cache-fix-gradle-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
osipxd committed Jul 25, 2024
1 parent e75ee7a commit 2f3fc00
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ android {
```properties
redmadrobot.add.repositories=true
```
- **android:** Don't apply [`org.gradle.android.cache-fix` plugin](https://github.com/gradle/android-cache-fix-gradle-plugin/) automatically.
This change allows removing android-cache-fix-gradle-plugin from the project dependencies.
See [the plugin documentation](https://github.com/gradle/android-cache-fix-gradle-plugin/?tab=readme-ov-file#applying-the-plugin) to learn how to apply this plugin to your project.
- **android:** Don't apply `proguard-android-optimize.txt` rules by default.
If you need these rules, apply it manually:
```kotlin
Expand Down Expand Up @@ -104,7 +107,7 @@ infrastructure-kotlin:

infrastructure-android:
- [Android Gradle Plugin](https://developer.android.com/studio/releases/gradle-plugin) `7.4.2``8.5.0`
- [Android cache fix Gradle plugin](https://github.com/gradle/android-cache-fix-gradle-plugin/releases/tag/v3.0.1) `2.7.0``3.0.1`
- Remove `android-cache-fix-gradle-plugin` from dependencies
- Remove `com.android.tools:common` from dependencies

infrastructure-detekt:
Expand Down
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ infrastructure-kotlin = { module = "com.redmadrobot.build:infrastructure-kotlin"
infrastructure-detekt = { module = "com.redmadrobot.build:infrastructure-detekt", version.ref = "infrastructure" }
infrastructure-publish = { module = "com.redmadrobot.build:infrastructure-publish", version.ref = "infrastructure" }
androidTools-gradle = "com.android.tools.build:gradle:8.5.0"
androidGradleCacheFix = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin:3.0.1"
detektGradle = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
pluginPublish = "com.gradle.publish:plugin-publish-plugin:1.2.1"
Expand Down
4 changes: 1 addition & 3 deletions infrastructure-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@ gradlePlugin {
dependencies {
api(projects.infrastructureKotlin)

compileOnly(libs.androidTools.gradle) // Should be provided by project

implementation(libs.androidGradleCacheFix)
compileOnly(libs.androidTools.gradle) // Should be provided by a project
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ public abstract class BaseAndroidPlugin internal constructor(
apply {
plugin(pluginId)
plugin("kotlin-android")

// Apply fix for Android caching problems
// See https://github.com/gradle/android-cache-fix-gradle-plugin
plugin("org.gradle.android.cache-fix")
}

configureAndroid()
Expand Down

0 comments on commit 2f3fc00

Please sign in to comment.