Standardize to more kt-compatible syntax
The groovy file syntax was very inconsistent, and as we are moving toward
being able to configure gradle with kotlin instead of groovy, the kt-compatible
syntax is preferred by the build team.
Change-Id: I8692107f9095a5725364318ff6628101686389f1
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 074020df..9e2ccc4 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -4,7 +4,7 @@
project.ext.supportRootFolder = project.projectDir.getParentFile()
repositories {
maven {
- url "${supportRootFolder}/../../prebuilts/androidx/external"
+ url("${supportRootFolder}/../../prebuilts/androidx/external")
}
}
@@ -16,7 +16,7 @@
configurations.classpath.resolutionStrategy {
eachDependency { details ->
- if (details.requested.group == 'org.jetbrains.kotlin') {
+ if (details.requested.group == "org.jetbrains.kotlin") {
details.useVersion build_versions.kotlin
}
}
@@ -28,7 +28,7 @@
ext.supportRootFolder = project.projectDir.getParentFile()
apply from: "local_dokka.gradle"
-apply from: 'repos.gradle'
+apply from: "repos.gradle"
apply from: "build_dependencies.gradle"
apply plugin: "kotlin"
apply from: "kotlin-dsl-dependency.gradle"
@@ -64,25 +64,25 @@
}
dependencies {
- cacheableApi build_libs.agp
- cacheableImplementation build_libs.dex_member_list
- cacheableApi build_libs.kotlin.gradle_plugin
- cacheableImplementation build_libs.kotlinpoet
- cacheableImplementation gradleApi()
- cacheableApi build_libs.dokka_gradle
+ cacheableApi(build_libs.agp)
+ cacheableImplementation(build_libs.dex_member_list)
+ cacheableApi(build_libs.kotlin.gradle_plugin)
+ cacheableImplementation(build_libs.kotlinpoet)
+ cacheableImplementation(gradleApi())
+ cacheableApi(build_libs.dokka_gradle)
// needed by inspection plugin
- cacheableImplementation "com.google.protobuf:protobuf-gradle-plugin:0.8.13"
+ cacheableImplementation("com.google.protobuf:protobuf-gradle-plugin:0.8.13")
// TODO(aurimas): remove when b/174658825 is fixed
- cacheableImplementation "org.anarres.jarjar:jarjar-gradle:1.0.1"
- cacheableImplementation "com.github.jengelman.gradle.plugins:shadow:5.2.0"
+ cacheableImplementation("org.anarres.jarjar:jarjar-gradle:1.0.1")
+ cacheableImplementation("com.github.jengelman.gradle.plugins:shadow:5.2.0")
// dependencies that aren't used by buildSrc directly but that we resolve here so that the
// root project doesn't need to re-resolve them and their dependencies on every build
- cacheableRuntimeOnly build_libs.hilt_plugin
+ cacheableRuntimeOnly(build_libs.hilt_plugin)
// room kotlintestapp uses the ksp plugin but it does not publish a plugin marker yet
- cacheableRuntimeOnly build_libs.kotlin.ksp_gradle_plugin
+ cacheableRuntimeOnly(build_libs.kotlin.ksp_gradle_plugin)
// dependencies whose resolutions we don't need to cache
compileOnly(findGradleKotlinDsl()) // Only one file in this configuration, no need to cache it
- implementation project("jetpad-integration") // Doesn't have a .pom, so not slow to load
+ implementation(project("jetpad-integration")) // Doesn't have a .pom, so not slow to load
}
apply plugin: "java-gradle-plugin"
@@ -102,12 +102,12 @@
gradlePlugin {
plugins {
benchmark {
- id = 'androidx.benchmark'
- implementationClass = 'androidx.benchmark.gradle.BenchmarkPlugin'
+ id = "androidx.benchmark"
+ implementationClass = "androidx.benchmark.gradle.BenchmarkPlugin"
}
inspection {
- id = 'androidx.inspection'
- implementationClass = 'androidx.inspection.gradle.InspectionPlugin'
+ id = "androidx.inspection"
+ implementationClass = "androidx.inspection.gradle.InspectionPlugin"
}
}
}
