Skip to content

Commit 5a70f8b

Browse files
authored
Move plugins to RefreshVersions (#5016)
Task/Issue URL: https://app.asana.com/0/1207908166761516/1208315099637999/f ### Description Moves our plugins to refreshVersions so that they will be updated when the `refreshVersions` task is run. As part of this moved all but the AGP plugin to the plugins block. Not quite sure why that one didn’t want to work but don’t want to spend too much time on it, it’s still part of RefreshVersions. I did not update the plugins as part of this PR. ### Steps to test this PR _Feature 1_ - [ ] Check the plugin versions in `versions.properties` match the previous versions - [ ] Run `./gradlew refreshVersions` and check the plugins get update comments (if they have an update of course) - [ ] Sync, build & run should be successful ### UI changes N/A ### Screenshot of the changes working <img width="702" alt="Screenshot 2024-09-17 at 11 19 50" src="https://github.com/user-attachments/assets/9bde859d-95d0-4cc4-a368-caec1960cd70">
1 parent cd35320 commit 5a70f8b

File tree

46 files changed

+84
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+84
-63
lines changed

ad-click/ad-click-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

anrs/anrs-internal/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

anrs/anrs-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

anvil/anvil-compiler/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
import static de.fayard.refreshVersions.core.Versions.versionFor
1617

1718
plugins {
1819
id 'java-library'
1920
id 'kotlin'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2122
}
2223

2324
apply from: "$rootProject.projectDir/code-formatting.gradle"
@@ -34,8 +35,9 @@ kotlin {
3435
dependencies {
3536
implementation project(path: ':anvil-annotations')
3637

37-
api "com.squareup.anvil:compiler-api:${anvil_version}"
38-
implementation("com.squareup.anvil:compiler-utils:${anvil_version}")
38+
def anvil_version = versionFor(project, "plugin.com.squareup.anvil")
39+
api "com.squareup.anvil:compiler-api:$anvil_version"
40+
implementation("com.squareup.anvil:compiler-utils:$anvil_version")
3941
implementation("com.squareup:kotlinpoet:1.11.0")
4042
implementation Google.dagger
4143
implementation project(":feature-toggles-api")

app-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

app-tracking-protection/vpn-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

app/build.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33

44
id 'kotlin-android'
55
id 'kotlin-kapt'
6-
id 'com.google.devtools.ksp' version "$ksp_version"
6+
id 'com.google.devtools.ksp'
77
id 'com.squareup.anvil'
88
}
99
apply from: '../versioning.gradle'
@@ -474,6 +474,9 @@ dependencies {
474474
internalImplementation "com.facebook.flipper:flipper:_"
475475
internalImplementation "com.facebook.soloader:soloader:_"
476476

477+
internalImplementation "com.github.YarikSOffice.Venom:venom:_"
478+
playImplementation "com.github.YarikSOffice.Venom:venom-no-op:_"
479+
477480
// Testing dependencies
478481
androidTestUtil AndroidX.test.orchestrator
479482
androidTestImplementation AndroidX.archCore.testing

autoconsent/autoconsent-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

autofill/autofill-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4-
id 'com.google.devtools.ksp' version "$ksp_version"
4+
id 'com.google.devtools.ksp'
55
}
66

77
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

breakage-reporting/breakage-reporting-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

broken-site/broken-site-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

build.gradle

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
import static de.fayard.refreshVersions.core.Versions.versionFor
23

34
buildscript {
45

56
ext {
6-
kotlin_version = '1.9.24'
7-
spotless = '6.1.2'
8-
anvil_version = '2.5.0-beta11'
9-
ksp_version = '1.9.24-1.0.20'
10-
gradle_plugin = '8.5.1'
117
min_sdk = 26
128
target_sdk = 34
139
compile_sdk = 34
14-
fladle_version = '0.17.4'
15-
kotlinter_version = '3.12.0'
16-
dokka_version = '1.8.20'
1710

1811
// Calculate lint_version (must always be gradle_plugin + 23)
19-
def components = gradle_plugin.split('\\.')
20-
lint_version = gradle_plugin.replaceFirst(components[0], (components[0].toInteger() + 23).toString())
12+
def gradle_plugin_version = versionFor(project, Android.tools.build.gradlePlugin)
13+
def components = gradle_plugin_version.split('\\.')
14+
lint_version = gradle_plugin_version.replaceFirst(components[0], (components[0].toInteger() + 23).toString())
2115
}
2216

2317
repositories {
@@ -26,26 +20,28 @@ buildscript {
2620
maven { url "https://plugins.gradle.org/m2/" }
2721
}
2822
dependencies {
29-
classpath "com.android.tools.build:gradle:$gradle_plugin"
30-
classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless"
31-
classpath "com.squareup.anvil:gradle-plugin:$anvil_version"
32-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
23+
classpath(Android.tools.build.gradlePlugin)
3324

3425
// NOTE: Do not place your application dependencies here; they belong
3526
// in the individual module build.gradle files
3627
}
3728
}
3829

3930
plugins {
40-
id 'org.jetbrains.dokka' version "$dokka_version"
41-
id 'com.osacky.fulladle' version "$fladle_version"
42-
id 'org.jmailen.kotlinter' version "$kotlinter_version" apply false
31+
id 'com.squareup.anvil' apply false
32+
id 'org.jetbrains.dokka'
33+
id 'com.osacky.fulladle'
34+
id 'org.jetbrains.kotlin.android' apply false
35+
id 'org.jmailen.kotlinter' apply false
36+
id 'com.google.devtools.ksp' apply false
37+
id 'com.diffplug.spotless' apply false
4338
}
4439

4540
allprojects {
4641
repositories {
4742
google()
4843
mavenCentral()
44+
maven { url 'https://jitpack.io' }
4945
}
5046
configurations.all {
5147
resolutionStrategy.force 'org.objenesis:objenesis:2.6'

common/common-utils/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
id 'com.squareup.anvil'
2222
}
2323

cookies/cookies-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

custom-tabs/custom-tabs-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

data-store/data-store-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

downloads/downloads-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

duckplayer/duckplayer-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

element-hiding/element-hiding-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

example-feature/example-feature-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

example-feature/example-feature-internal/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

experiments/experiments-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

feature-toggles/feature-toggles-internal/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

fingerprint-protection/fingerprint-protection-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

history/history-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

httpsupgrade/httpsupgrade-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

network-protection/network-protection-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

new-tab-page/new-tab-page-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

privacy-config/privacy-config-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

privacy-protections-popup/privacy-protections-popup-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
id 'com.squareup.anvil'
2222
}
2323

remote-messaging/remote-messaging-internal/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

remote-messaging/remote-messaging-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

request-filterer/request-filterer-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

runtime-checks/runtime-checks-store/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'com.google.devtools.ksp' version "$ksp_version"
20+
id 'com.google.devtools.ksp'
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

saved-sites/saved-sites-impl/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
2020
id 'com.squareup.anvil'
21-
id 'com.google.devtools.ksp' version "$ksp_version"
21+
id 'com.google.devtools.ksp'
2222
}
2323

2424
apply from: "$rootProject.projectDir/gradle/android-library.gradle"

0 commit comments

Comments
 (0)