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/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle index 7e80477..d8fd2f8 100644 --- a/activity/activity-ktx/build.gradle +++ b/activity/activity-ktx/build.gradle
@@ -28,7 +28,7 @@ dependencies { api(project(":activity:activity")) api("androidx.core:core-ktx:1.1.0") { - because 'Mirror activity dependency graph for -ktx artifacts' + because "Mirror activity dependency graph for -ktx artifacts" } api("androidx.lifecycle:lifecycle-runtime-ktx:2.3.0") { because 'Mirror activity dependency graph for -ktx artifacts' @@ -46,9 +46,9 @@ androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.activity', module: 'activity' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.activity", module: "activity" + }) } androidx {
diff --git a/activity/activity-lint/build.gradle b/activity/activity-lint/build.gradle index 367343d..849b0a8 100644 --- a/activity/activity-lint/build.gradle +++ b/activity/activity-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle index 0bc38104..a930abc 100644 --- a/activity/activity/build.gradle +++ b/activity/activity/build.gradle
@@ -38,11 +38,11 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(TRUTH) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.activity', module: 'activity' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.activity", module: "activity" + }) - lintPublish(project(':activity:activity-lint')) + lintPublish(project(":activity:activity-lint")) } androidx {
diff --git a/ads/ads-identifier-testing/build.gradle b/ads/ads-identifier-testing/build.gradle index 7d06280..07d65f8 100644 --- a/ads/ads-identifier-testing/build.gradle +++ b/ads/ads-identifier-testing/build.gradle
@@ -29,11 +29,11 @@ android { lintOptions { - disable 'InvalidPackage' // Lint is unhappy about mockito package + disable "InvalidPackage" // Lint is unhappy about mockito package } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility(JavaVersion.VERSION_1_7) + targetCompatibility(JavaVersion.VERSION_1_7) } }
diff --git a/ads/ads-identifier/build.gradle b/ads/ads-identifier/build.gradle index c28cbdf..6841cce 100644 --- a/ads/ads-identifier/build.gradle +++ b/ads/ads-identifier/build.gradle
@@ -46,8 +46,8 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility(JavaVersion.VERSION_1_7) + targetCompatibility(JavaVersion.VERSION_1_7) } }
diff --git a/androidx-plugin/build.gradle b/androidx-plugin/build.gradle index 9885fa4..154fadc 100644 --- a/androidx-plugin/build.gradle +++ b/androidx-plugin/build.gradle
@@ -1,13 +1,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { - apply from: '../buildSrc/build_dependencies.gradle' + apply from: "../buildSrc/build_dependencies.gradle" repositories { google() jcenter() maven { - url 'https://androidx.dev/dokka/builds/6656073/artifacts/repository' + url("https://androidx.dev/dokka/builds/6656073/artifacts/repository") metadataSources { mavenPom() artifact() @@ -29,14 +29,14 @@ mavenCentral() jcenter() maven { - url 'https://androidx.dev/metalava/builds/6604778/artifacts/repo/m2repository' + url("https://androidx.dev/metalava/builds/6604778/artifacts/repo/m2repository") metadataSources { mavenPom() artifact() } } maven { - url 'https://androidx.dev/dokka/builds/6656073/artifacts/repository' + url("https://androidx.dev/dokka/builds/6656073/artifacts/repository") metadataSources { mavenPom() artifact()
diff --git a/androidx-plugin/gradle-plugin/build.gradle b/androidx-plugin/gradle-plugin/build.gradle index 793655a..5ec65c17 100644 --- a/androidx-plugin/gradle-plugin/build.gradle +++ b/androidx-plugin/gradle-plugin/build.gradle
@@ -7,30 +7,30 @@ ext.supportRootFolder = project.projectDir.getParentFile().getParentFile() -apply from: '../../buildSrc/build_dependencies.gradle' +apply from: "../../buildSrc/build_dependencies.gradle" apply from: "../../buildSrc/kotlin-dsl-dependency.gradle" dependencies { - implementation project(":jetpad-integration") + implementation(project(":jetpad-integration")) - compileOnly findGradleKotlinDsl() - implementation gradleApi() + compileOnly(findGradleKotlinDsl()) + implementation(gradleApi()) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${build_versions.kotlin}" + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${build_versions.kotlin}") - implementation build_libs.agp - implementation build_libs.dex_member_list - implementation build_libs.kotlin.gradle_plugin - implementation build_libs.kotlinpoet + implementation(build_libs.agp) + implementation(build_libs.dex_member_list) + implementation(build_libs.kotlin.gradle_plugin) + implementation(build_libs.kotlinpoet) - implementation "org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}" - implementation "org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}" + implementation("org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}") + implementation("org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}") // Not really sure about these: - implementation "androidx.benchmark:benchmark-gradle-plugin:1.0.0" - implementation "com.google.protobuf:protobuf-gradle-plugin:0.8.13" - implementation "org.anarres.jarjar:jarjar-gradle:1.0.1" - implementation "com.github.jengelman.gradle.plugins:shadow:5.2.0" + implementation("androidx.benchmark:benchmark-gradle-plugin:1.0.0") + implementation("com.google.protobuf:protobuf-gradle-plugin:0.8.13") + implementation("org.anarres.jarjar:jarjar-gradle:1.0.1") + implementation("com.github.jengelman.gradle.plugins:shadow:5.2.0") } sourceSets {
diff --git a/androidx-plugin/settings.gradle b/androidx-plugin/settings.gradle index 81a01da..6c460ee 100644 --- a/androidx-plugin/settings.gradle +++ b/androidx-plugin/settings.gradle
@@ -1,3 +1,3 @@ -include ':gradle-plugin' -include ':jetpad-integration' -project(':jetpad-integration').projectDir = file('../buildSrc/jetpad-integration') \ No newline at end of file +include ":gradle-plugin" +include ":jetpad-integration" +project(":jetpad-integration").projectDir = file("../buildSrc/jetpad-integration") \ No newline at end of file
diff --git a/annotation/annotation-experimental-lint/build.gradle b/annotation/annotation-experimental-lint/build.gradle index bc810c7..2434718 100644 --- a/annotation/annotation-experimental-lint/build.gradle +++ b/annotation/annotation-experimental-lint/build.gradle
@@ -34,12 +34,12 @@ } dependencies { - compileOnly LINT_API_LATEST - compileOnly KOTLIN_STDLIB + compileOnly(LINT_API_LATEST) + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle index 5fac269..99a9bf2 100644 --- a/annotation/annotation-experimental-lint/integration-tests/build.gradle +++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle
@@ -25,8 +25,8 @@ } dependencies { - implementation KOTLIN_STDLIB - implementation project(":annotation:annotation-experimental") + implementation(KOTLIN_STDLIB) + implementation(project(":annotation:annotation-experimental")) } // Allow usage of Kotlin's @Experimental annotation, which is itself experimental.
diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle index 920f1791..f2310ec 100644 --- a/annotation/annotation-experimental/build.gradle +++ b/annotation/annotation-experimental/build.gradle
@@ -27,15 +27,15 @@ } dependencies { - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) lintPublish(project(":annotation:annotation-experimental-lint")) } android { compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility(JavaVersion.VERSION_1_7) + targetCompatibility(JavaVersion.VERSION_1_7) } buildTypes.all {
diff --git a/annotation/annotation/build.gradle b/annotation/annotation/build.gradle index 6127a67..eb13c91 100644 --- a/annotation/annotation/build.gradle +++ b/annotation/annotation/build.gradle
@@ -18,8 +18,8 @@ // themselves have been manually extracted into the // external-annotations directory, and those are packaged separately // below by the annotationsZip task. - exclude('androidx/annotation/ProductionVisibility.class') - exclude('androidx/annotation/DimensionUnit.class') + exclude("androidx/annotation/ProductionVisibility.class") + exclude("androidx/annotation/DimensionUnit.class") } task annotationsZip(type: Zip) {
diff --git a/appcompat/appcompat-lint/build.gradle b/appcompat/appcompat-lint/build.gradle index d6cea5e..7c589a4 100644 --- a/appcompat/appcompat-lint/build.gradle +++ b/appcompat/appcompat-lint/build.gradle
@@ -26,12 +26,12 @@ } dependencies { - compileOnly LINT_API_LATEST - compileOnly KOTLIN_STDLIB + compileOnly(LINT_API_LATEST) + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle index 97e6200..33879d3 100644 --- a/appcompat/appcompat-resources/build.gradle +++ b/appcompat/appcompat-resources/build.gradle
@@ -39,9 +39,9 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.appcompat', module: 'appcompat-resources' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.appcompat", module: "appcompat-resources" + }) } android { @@ -56,7 +56,7 @@ aaptOptions { additionalParameters "--no-version-vectors" - noCompress 'ttf' + noCompress "ttf" } }
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle index 833d12e..2fd0b47 100644 --- a/appcompat/appcompat/build.gradle +++ b/appcompat/appcompat/build.gradle
@@ -32,10 +32,10 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker - androidTestImplementation project(':internal-testutils-appcompat'), { - exclude group: 'androidx.appcompat', module: 'appcompat' - exclude group: 'androidx.core', module: 'core' - } + androidTestImplementation(project(":internal-testutils-appcompat"), { + exclude group: "androidx.appcompat", module: "appcompat" + exclude group: "androidx.core", module: "core" + }) androidTestImplementation(MULTIDEX) testImplementation(KOTLIN_STDLIB) @@ -59,12 +59,12 @@ } sourceSets { - main.res.srcDirs += 'src/main/res-public' + main.res.srcDirs += "src/main/res-public" } aaptOptions { additionalParameters "--no-version-vectors" - noCompress 'ttf' + noCompress "ttf" } testOptions { @@ -79,9 +79,9 @@ consumerProguardFiles("proguard-rules.pro") } - useLibrary 'android.test.runner' - useLibrary 'android.test.base' - useLibrary 'android.test.mock' + useLibrary "android.test.runner" + useLibrary "android.test.base" + useLibrary "android.test.mock" } androidx {
diff --git a/appsearch/local-storage/build.gradle b/appsearch/local-storage/build.gradle index 3d12966..62ccb52 100644 --- a/appsearch/local-storage/build.gradle +++ b/appsearch/local-storage/build.gradle
@@ -22,8 +22,8 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { - id('AndroidXPlugin') - id('com.android.library') + id("AndroidXPlugin") + id("com.android.library") } android { @@ -37,13 +37,13 @@ // splitting targets, continuing with the consumerProguardFiles solution here, fixing the // flows that perform duplicate desugaring, or something else). minifyEnabled false - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } // TODO(b/161205849): We've had to move libicing.so compilation into appsearch:appsearch to get // it included into the exported aar. Find a proper solution for bundling libicing.so into // appsearch-release.aar and move compilation of libicing.so back into the external/icing tree. sourceSets { - androidTest.java.srcDir '../../../../external/icing/java/tests/instrumentation/' + androidTest.java.srcDir "../../../../external/icing/java/tests/instrumentation/" } defaultConfig { externalNativeBuild { @@ -56,8 +56,8 @@ } externalNativeBuild { cmake { - version '3.10.2' - path '../../../../external/icing/CMakeLists.txt' + version "3.10.2" + path "../../../../external/icing/CMakeLists.txt" } } } @@ -69,14 +69,14 @@ ) dependencies { - releaseBundleInside(project(path: ':icing', configuration: "exportRelease")) - debugBundleInside(project(path: ':icing', configuration: "exportDebug")) + releaseBundleInside(project(path: ":icing", configuration: "exportRelease")) + debugBundleInside(project(path: ":icing", configuration: "exportDebug")) - api('androidx.annotation:annotation:1.1.0') + api("androidx.annotation:annotation:1.1.0") - implementation project(':appsearch:appsearch') - implementation('androidx.concurrent:concurrent-futures:1.0.0') - implementation('androidx.core:core:1.2.0') + implementation(project(":appsearch:appsearch")) + implementation("androidx.concurrent:concurrent-futures:1.0.0") + implementation("androidx.core:core:1.2.0") androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RULES) @@ -86,12 +86,12 @@ } androidx { - name = 'AppSearch Local Storage' + name = "AppSearch Local Storage" publish = Publish.SNAPSHOT_AND_RELEASE mavenGroup = LibraryGroups.APPSEARCH mavenVersion = LibraryVersions.APPSEARCH - inceptionYear = '2020' + inceptionYear = "2020" description = - 'An implementation of AppSearchSession which uses local app storage and a local copy of ' + - 'the search library' + "An implementation of AppSearchSession which uses local app storage and a local copy of " + + "the search library" }
diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle index 23e6657..c6b4e56 100644 --- a/autofill/autofill/build.gradle +++ b/autofill/autofill/build.gradle
@@ -33,7 +33,7 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(TRUTH) - androidTestImplementation 'junit:junit:4.12' + androidTestImplementation("junit:junit:4.12") } androidx {
diff --git a/benchmark/common/build.gradle b/benchmark/common/build.gradle index 686ab9a..ebeeee7 100644 --- a/benchmark/common/build.gradle +++ b/benchmark/common/build.gradle
@@ -52,4 +52,4 @@ kotlinOptions { freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"] } -} \ No newline at end of file +}
diff --git a/benchmark/gradle-plugin/build.gradle b/benchmark/gradle-plugin/build.gradle index 6f34e1c..4223fd2 100644 --- a/benchmark/gradle-plugin/build.gradle +++ b/benchmark/gradle-plugin/build.gradle
@@ -30,12 +30,12 @@ apply from: "../../buildSrc/kotlin-dsl-dependency.gradle" dependencies { - implementation findGradleKotlinDsl() - implementation gradleApi() + implementation(findGradleKotlinDsl()) + implementation(gradleApi()) implementation("com.android.tools.build:gradle:4.0.0-beta04") implementation(KOTLIN_STDLIB) - testImplementation gradleTestKit() + testImplementation(gradleTestKit()) testImplementation(project(":internal-testutils-gradle-plugin")) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT)
diff --git a/benchmark/integration-tests/crystalball-experiment/build.gradle b/benchmark/integration-tests/crystalball-experiment/build.gradle index 147c671..ed90325 100644 --- a/benchmark/integration-tests/crystalball-experiment/build.gradle +++ b/benchmark/integration-tests/crystalball-experiment/build.gradle
@@ -30,35 +30,35 @@ multiDexEnabled true // testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' // Listener List - testInstrumentationRunnerArgument 'listener', - 'android.device.collectors.CpuUsageListener,' + - 'android.device.collectors.ProcLoadListener,' + - 'android.device.collectors.PerfettoListener,' + - 'android.device.collectors.AppStartupListener,' + - 'android.device.collectors.JankListener,' + - 'android.device.collectors.CrashListener,' + - 'android.device.collectors.ScreenshotOnFailureCollector,' + - 'android.device.collectors.LogcatOnFailureCollector,' + - 'android.device.collectors.IncidentReportListener,' + - 'android.device.collectors.TotalPssMetricListener' + testInstrumentationRunnerArgument "listener", + "android.device.collectors.CpuUsageListener," + + "android.device.collectors.ProcLoadListener," + + "android.device.collectors.PerfettoListener," + + "android.device.collectors.AppStartupListener," + + "android.device.collectors.JankListener," + + "android.device.collectors.CrashListener," + + "android.device.collectors.ScreenshotOnFailureCollector," + + "android.device.collectors.LogcatOnFailureCollector," + + "android.device.collectors.IncidentReportListener," + + "android.device.collectors.TotalPssMetricListener" // ProcLoadListener - testInstrumentationRunnerArgument 'procload-collector:proc-loadavg-interval', '2000' - testInstrumentationRunnerArgument 'procload-collector:proc-loadavg-threshold', '0.5' - testInstrumentationRunnerArgument 'procload-collector:proc-loadavg-timeout', '90000' + testInstrumentationRunnerArgument "procload-collector:proc-loadavg-interval", "2000" + testInstrumentationRunnerArgument "procload-collector:proc-loadavg-threshold", "0.5" + testInstrumentationRunnerArgument "procload-collector:proc-loadavg-timeout", "90000" // CpuUsageListener - testInstrumentationRunnerArgument 'cpuusage-collector:disable_per_freq', 'true' - testInstrumentationRunnerArgument 'cpuusage-collector:disable_per_pkg', 'true' + testInstrumentationRunnerArgument "cpuusage-collector:disable_per_freq", "true" + testInstrumentationRunnerArgument "cpuusage-collector:disable_per_pkg", "true" // TotalPssMetricListener - testInstrumentationRunnerArgument 'totalpss-collector:process-names', 'androidx.ui.demos' + testInstrumentationRunnerArgument "totalpss-collector:process-names", "androidx.ui.demos" // JankListener (disable) - testInstrumentationRunnerArgument 'jank-listener:log', 'true' + testInstrumentationRunnerArgument "jank-listener:log", "true" // Microbenchmark runner configuration - testInstrumentationRunnerArgument 'iterations', '1' + testInstrumentationRunnerArgument "iterations", "1" } }
diff --git a/benchmark/integration-tests/macrobenchmark-target/build.gradle b/benchmark/integration-tests/macrobenchmark-target/build.gradle index 4de1d5d..13f9ec5 100644 --- a/benchmark/integration-tests/macrobenchmark-target/build.gradle +++ b/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -27,7 +27,7 @@ release { minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } }
diff --git a/benchmark/integration-tests/macrobenchmark/build.gradle b/benchmark/integration-tests/macrobenchmark/build.gradle index a45af07..7ce9cba 100644 --- a/benchmark/integration-tests/macrobenchmark/build.gradle +++ b/benchmark/integration-tests/macrobenchmark/build.gradle
@@ -30,7 +30,7 @@ android { defaultConfig { minSdkVersion 28 - testInstrumentationRunnerArgument 'androidx.benchmark.output.enable', 'true' + testInstrumentationRunnerArgument "androidx.benchmark.output.enable", "true" } } @@ -45,9 +45,9 @@ } // Define a task dependency so the app is installed before we run macro benchmarks. -tasks.getByPath(':benchmark:integration-tests:macrobenchmark:connectedCheck') +tasks.getByPath(":benchmark:integration-tests:macrobenchmark:connectedCheck") .dependsOn( tasks.getByPath( - ':benchmark:integration-tests:macrobenchmark-target:installRelease' + ":benchmark:integration-tests:macrobenchmark-target:installRelease" ) )
diff --git a/benchmark/macro/build.gradle b/benchmark/macro/build.gradle index 2fd242c..72c0ac1 100644 --- a/benchmark/macro/build.gradle +++ b/benchmark/macro/build.gradle
@@ -65,9 +65,9 @@ } // Define a task dependency so the app is installed before we run macro benchmarks. -tasks.getByPath(':benchmark:benchmark-macro-junit4:connectedCheck') +tasks.getByPath(":benchmark:benchmark-macro-junit4:connectedCheck") .dependsOn( tasks.getByPath( - ':benchmark:integration-tests:macrobenchmark-target:installRelease' + ":benchmark:integration-tests:macrobenchmark-target:installRelease" ) ) \ No newline at end of file
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle index 31321cf..0933892 100644 --- a/biometric/biometric/build.gradle +++ b/biometric/biometric/build.gradle
@@ -53,16 +53,16 @@ android { aaptOptions { - noCompress 'ttf' + noCompress "ttf" } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility(JavaVersion.VERSION_1_7) + targetCompatibility(JavaVersion.VERSION_1_7) } testOptions.unitTests.includeAndroidResources = true
diff --git a/biometric/integration-tests/testapp/build.gradle b/biometric/integration-tests/testapp/build.gradle index 9ff3141..a5ca186 100755 --- a/biometric/integration-tests/testapp/build.gradle +++ b/biometric/integration-tests/testapp/build.gradle
@@ -31,11 +31,11 @@ } sourceSets { - main.manifest.srcFile 'src/main/AndroidManifest.xml' - main.java.srcDirs = ['src/main/java'] - main.java.includes = ['**/*.java'] - main.java.excludes = ['**/build/**'] - main.res.srcDirs = ['src/main/res'] + main.manifest.srcFile "src/main/AndroidManifest.xml" + main.java.srcDirs = ["src/main/java"] + main.java.includes = ["**/*.java"] + main.java.excludes = ["**/build/**"] + main.res.srcDirs = ["src/main/res"] } buildTypes {
diff --git a/build.gradle b/build.gradle index decb28f..6475889 100644 --- a/build.gradle +++ b/build.gradle
@@ -21,8 +21,8 @@ buildscript { SdkHelperKt.setSupportRootFolder(project, project.projectDir) - apply from: 'buildSrc/repos.gradle' - apply from: 'buildSrc/build_dependencies.gradle' + apply from: "buildSrc/repos.gradle" + apply from: "buildSrc/build_dependencies.gradle" repos.addMavenRepositories(repositories) SdkHelperKt.writeSdkPathToLocalPropertiesFile(project)
diff --git a/buildSrc-tests/build.gradle b/buildSrc-tests/build.gradle index 94a52c2..2b4b971 100644 --- a/buildSrc-tests/build.gradle +++ b/buildSrc-tests/build.gradle
@@ -26,8 +26,8 @@ } dependencies { - implementation gradleApi() - testImplementation JUNIT + implementation(gradleApi()) + testImplementation(JUNIT) implementation(project.files(new File(BuildServerConfigurationKt.getRootOutDirectory(project), "buildSrc/build/libs/buildSrc.jar"))) }
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" } } }
diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle index 16179ec..c6dacda 100644 --- a/buildSrc/build_dependencies.gradle +++ b/buildSrc/build_dependencies.gradle
@@ -47,10 +47,10 @@ if (System.getenv("BUILD_DOKKA") != null) { build_versions.dokka = getSourceDokkaVersion() } else { - build_versions.dokka = '0.9.17-g013' + build_versions.dokka = "0.9.17-g013" } -rootProject.ext['build_versions'] = build_versions +rootProject.ext["build_versions"] = build_versions def build_libs = [:] @@ -75,4 +75,4 @@ build_libs.hilt_plugin = "com.google.dagger:hilt-android-gradle-plugin:${build_versions.hilt}" -rootProject.ext['build_libs'] = build_libs +rootProject.ext["build_libs"] = build_libs
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle index 6c39faa..0eb002e 100644 --- a/buildSrc/dependencies.gradle +++ b/buildSrc/dependencies.gradle
@@ -17,18 +17,18 @@ def libs = [:] libs.exclude_bytebuddy = { - exclude group: 'net.bytebuddy' + exclude group: "net.bytebuddy" } libs.exclude_for_espresso = { - exclude group: 'androidx.annotation' - exclude group: 'androidx.appcompat' - exclude group: 'androidx.recyclerview' - exclude group: 'androidx.legacy' - exclude group: 'androidx.cardview' - exclude group: 'androidx.fragment' - exclude group: 'com.google.android.material' - exclude group: 'androidx.core' + exclude group: "androidx.annotation" + exclude group: "androidx.appcompat" + exclude group: "androidx.recyclerview" + exclude group: "androidx.legacy" + exclude group: "androidx.cardview" + exclude group: "androidx.fragment" + exclude group: "com.google.android.material" + exclude group: "androidx.core" } -rootProject.ext['libs'] = libs +rootProject.ext["libs"] = libs
diff --git a/buildSrc/jetpad-integration/build.gradle b/buildSrc/jetpad-integration/build.gradle index e09185b..995d9c5 100644 --- a/buildSrc/jetpad-integration/build.gradle +++ b/buildSrc/jetpad-integration/build.gradle
@@ -1 +1 @@ -apply plugin:'java' \ No newline at end of file +apply plugin:"java"
diff --git a/buildSrc/remoteBuildCache.gradle b/buildSrc/remoteBuildCache.gradle index 51c07c2..11efaf3 100644 --- a/buildSrc/remoteBuildCache.gradle +++ b/buildSrc/remoteBuildCache.gradle
@@ -1,7 +1,7 @@ -def useRemoteBuildCache = System.getenv('USE_ANDROIDX_REMOTE_BUILD_CACHE') == 'true' +def useRemoteBuildCache = System.getenv("USE_ANDROIDX_REMOTE_BUILD_CACHE") == "true" if (useRemoteBuildCache) { - logger.warn('Using AndroidX remote build cache') + logger.warn("Using AndroidX remote build cache") gradle.settingsEvaluated { settings -> settings.buildCache { remote(HttpBuildCache) { @@ -10,10 +10,10 @@ case { it.contains("mac os x") }: case { it.contains("darwin") }: case { it.contains("osx") }: - url = 'http://gradle-remote-cache.uplink2.goog:999/cache/' + url = "http://gradle-remote-cache.uplink2.goog:999/cache/" break default: - url = 'http://gradle-remote-cache.uplink.goog:999/cache/' + url = "http://gradle-remote-cache.uplink.goog:999/cache/" break } allowInsecureProtocol = true
diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle index 12d0d92..a882adba 100644 --- a/buildSrc/repos.gradle +++ b/buildSrc/repos.gradle
@@ -31,7 +31,7 @@ */ def addMavenRepositories(RepositoryHandler handler) { handler.maven { - url "${repos.prebuiltsRoot}/androidx/internal" + url("${repos.prebuiltsRoot}/androidx/internal") metadataSources { mavenPom() artifact() @@ -45,7 +45,7 @@ handler.ivy { // TODO: maybe we can move this no-group ivy repo directly into prebuilts/androidx/external // once https://youtrack.jetbrains.com/issue/KT-35049 gets resolved */ - url "${repos.prebuiltsRoot}/androidx/external/no-group" + url("${repos.prebuiltsRoot}/androidx/external/no-group") patternLayout { artifact("[artifact]/[revision]/[artifact]-[revision].[ext]") } @@ -53,12 +53,12 @@ it.artifact() } content { - includeGroup "" + includeGroup("") } } def buildDokka = System.getenv("BUILD_DOKKA") != null handler.maven { - url "${repos.prebuiltsRoot}/androidx/external" + url("${repos.prebuiltsRoot}/androidx/external") metadataSources { mavenPom() artifact() @@ -71,9 +71,9 @@ } if (buildDokka) { handler.maven { - url "${repos.checkoutRoot}/external/dokka/build/dist-maven" + url("${repos.checkoutRoot}/external/dokka/build/dist-maven") content { - includeGroup "org.jetbrains.dokka" + includeGroup("org.jetbrains.dokka") } } } @@ -82,7 +82,7 @@ handler.jcenter() handler.google() handler.maven { - url "https://plugins.gradle.org/m2/" + url("https://plugins.gradle.org/m2/") } handler.mavenLocal() }
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index af0681e..9849f62 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle
@@ -14,4 +14,4 @@ * limitations under the License. */ -include ':jetpad-integration' +include ":jetpad-integration"
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle index 5e8ef32..20baa76 100644 --- a/camera/camera-camera2-pipe-integration/build.gradle +++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -38,9 +38,9 @@ ) dependencies { - implementation 'androidx.concurrent:concurrent-listenablefuture-callback:1.0.0-beta01' - releaseBundleInside(project(path: ':camera:camera-camera2-pipe', configuration: "exportRelease")) - debugBundleInside(project(path: ':camera:camera-camera2-pipe', configuration: "exportDebug")) + implementation("androidx.concurrent:concurrent-listenablefuture-callback:1.0.0-beta01") + releaseBundleInside(project(path: ":camera:camera-camera2-pipe", configuration: "exportRelease")) + debugBundleInside(project(path: ":camera:camera-camera2-pipe", configuration: "exportDebug")) // Classes and types that are needed at compile & runtime api("androidx.annotation:annotation:1.1.0") @@ -53,8 +53,8 @@ implementation(KOTLIN_STDLIB) // Since we jarjar CameraPipe, include the transitive dependencies as implementation - implementation CAMERA_PIPE_DEPS.API - implementation CAMERA_PIPE_DEPS.IMPLEMENTATION + implementation(CAMERA_PIPE_DEPS.API) + implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION) kapt(DAGGER_COMPILER)
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle index b9fe9a4..014c0312 100644 --- a/camera/camera-camera2-pipe/build.gradle +++ b/camera/camera-camera2-pipe/build.gradle
@@ -35,8 +35,8 @@ // NOTE: API and IMPLEMENTATION dependencies are defined in dependencies.gradle to export for // other modules depending on the jarjar variant of CameraPipe. All dependencies should be // added there rather than directly here. - api CAMERA_PIPE_DEPS.API - implementation CAMERA_PIPE_DEPS.IMPLEMENTATION + api(CAMERA_PIPE_DEPS.API) + implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION) kapt(DAGGER_COMPILER) @@ -84,10 +84,10 @@ def exportJarTask = tasks.register("exportJar${suffix}", Jar) { archiveBaseName.set("camera-camera2-pipe-${variantName}-export") def kotlinCompileTask = tasks.findByName("compile${suffix}Kotlin") - from kotlinCompileTask.outputs.files - from files(variant.javaCompileProvider.get().destinationDir) - dependsOn kotlinCompileTask - dependsOn variant.javaCompileProvider.get() + from(kotlinCompileTask.outputs.files) + from(files(variant.javaCompileProvider.get().destinationDir)) + dependsOn(kotlinCompileTask) + dependsOn(variant.javaCompileProvider.get()) } def exportConfiguration = configurations.register("export${suffix}") artifacts.add(exportConfiguration.name, exportJarTask.flatMap{ it.archiveFile })
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle index 7b7671f..7f670ad9 100644 --- a/camera/camera-camera2/build.gradle +++ b/camera/camera-camera2/build.gradle
@@ -72,7 +72,7 @@ } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } // Use Robolectric 4.+
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle index 49d045a..4d18631 100644 --- a/camera/camera-core/build.gradle +++ b/camera/camera-core/build.gradle
@@ -44,9 +44,9 @@ testImplementation(TRUTH) testImplementation(ROBOLECTRIC) testImplementation(MOCKITO_CORE) - testImplementation project(":camera:camera-testing"), { + testImplementation(project(":camera:camera-testing"), { exclude group: "androidx.camera", module: "camera-core" - } + }) testImplementation("androidx.exifinterface:exifinterface:1.0.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) @@ -72,7 +72,7 @@ testOptions.unitTests.includeAndroidResources = true packagingOptions { - pickFirst 'META-INF/support.camera_camera-core.version' + pickFirst "META-INF/support.camera_camera-core.version" } }
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle index b7c3e5f..1d55af9 100644 --- a/camera/camera-extensions/build.gradle +++ b/camera/camera-extensions/build.gradle
@@ -41,7 +41,7 @@ testImplementation(MOCKITO_CORE) testImplementation(ROBOLECTRIC) testImplementation(TRUTH) - testImplementation project(":camera:camera-testing") + testImplementation(project(":camera:camera-testing")) testImplementation(project(":camera:camera-extensions-stub")) // To use the extensions-stub for testing directly.
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle index 0efc3c1..6f3a86a 100644 --- a/camera/camera-video/build.gradle +++ b/camera/camera-video/build.gradle
@@ -33,7 +33,7 @@ annotationProcessor(AUTO_VALUE) - testImplementation 'junit:junit:4.12' + testImplementation("junit:junit:4.12") testImplementation(KOTLIN_STDLIB) testImplementation(ANDROIDX_TEST_CORE) testImplementation(ANDROIDX_TEST_RUNNER) @@ -41,11 +41,11 @@ testImplementation(TRUTH) testImplementation(ROBOLECTRIC) testImplementation(MOCKITO_CORE) - testImplementation project(":camera:camera-testing"), { + testImplementation(project(":camera:camera-testing"), { exclude group: "androidx.camera", module: "camera-core" - } + }) - androidTestImplementation project(path: ':camera:camera-camera2') + androidTestImplementation(project(path: ":camera:camera-camera2")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle index 54a0c61..edb66a5 100644 --- a/camera/camera-view/build.gradle +++ b/camera/camera-view/build.gradle
@@ -29,7 +29,7 @@ implementation("androidx.appcompat:appcompat:1.1.0") api("androidx.lifecycle:lifecycle-common:2.0.0") api(project(":camera:camera-core")) - implementation project(path: ':camera:camera-lifecycle') + implementation(project(path: ":camera:camera-lifecycle")) api("androidx.annotation:annotation:1.0.0") implementation(GUAVA_LISTENABLE_FUTURE) implementation("androidx.core:core:1.1.0") @@ -44,7 +44,7 @@ testImplementation(TRUTH) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_CORE) - testImplementation project(":camera:camera-testing") + testImplementation(project(":camera:camera-testing")) androidTestImplementation(project(":camera:camera-testing")) androidTestImplementation(MOCKITO_CORE)
diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle index 2d19195..4aa9ef6 100644 --- a/camera/integration-tests/camerapipetestapp/build.gradle +++ b/camera/integration-tests/camerapipetestapp/build.gradle
@@ -32,11 +32,11 @@ } sourceSets { - main.manifest.srcFile 'src/main/AndroidManifest.xml' - main.java.srcDirs = ['src/main/java'] - main.java.excludes = ['**/build/**'] - main.java.includes = ['**/*.java'] - main.res.srcDirs = ['src/main/res'] + main.manifest.srcFile "src/main/AndroidManifest.xml" + main.java.srcDirs = ["src/main/java"] + main.java.excludes = ["**/build/**"] + main.java.includes = ["**/*.java"] + main.res.srcDirs = ["src/main/res"] } buildTypes { @@ -44,7 +44,7 @@ minifyEnabled true shrinkResources true proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), - 'proguard-rules.pro') + "proguard-rules.pro") } } }
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle index 7333c85..65a474e 100644 --- a/camera/integration-tests/coretestapp/build.gradle +++ b/camera/integration-tests/coretestapp/build.gradle
@@ -98,8 +98,8 @@ androidTestImplementation(project(":camera:camera-testing")) androidTestImplementation(project(":concurrent:concurrent-futures")) androidTestImplementation(project(":concurrent:concurrent-futures-ktx")) - androidTestImplementation(project(':internal-testutils-runtime')) - androidTestImplementation(project(':lifecycle:lifecycle-runtime-testing')) + androidTestImplementation(project(":internal-testutils-runtime")) + androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing")) testImplementation(JUNIT) testImplementation(TRUTH)
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle index f6d552f..bdcea02 100644 --- a/camera/integration-tests/extensionstestapp/build.gradle +++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -37,7 +37,7 @@ implementation(project(":camera:camera-extensions")) implementation(project(":camera:camera-lifecycle")) implementation(project(":camera:camera-view")) - implementation 'androidx.test.espresso:espresso-idling-resource:3.1.0' + implementation("androidx.test.espresso:espresso-idling-resource:3.1.0") implementation(GUAVA_LISTENABLE_FUTURE) implementation("androidx.concurrent:concurrent-futures:1.0.0")
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle index 4a62976..db40530 100644 --- a/camera/integration-tests/timingtestapp/build.gradle +++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -30,11 +30,11 @@ versionName "1.35" } sourceSets { - main.manifest.srcFile 'src/main/AndroidManifest.xml' - main.java.srcDirs = ['src/main/java'] - main.java.excludes = ['**/build/**'] - main.java.includes = ['**/*.java'] - main.res.srcDirs = ['src/main/res'] + main.manifest.srcFile "src/main/AndroidManifest.xml" + main.java.srcDirs = ["src/main/java"] + main.java.excludes = ["**/build/**"] + main.java.includes = ["**/*.java"] + main.res.srcDirs = ["src/main/res"] } buildTypes { release {
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle index 8a66ede..7d8e90f 100644 --- a/camera/integration-tests/uiwidgetstestapp/build.gradle +++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -31,11 +31,11 @@ } sourceSets { - main.manifest.srcFile 'src/main/AndroidManifest.xml' - main.java.srcDirs = ['src/main/java'] - main.java.excludes = ['**/build/**'] - main.java.includes = ['**/*.java'] - main.res.srcDirs = ['src/main/res'] + main.manifest.srcFile "src/main/AndroidManifest.xml" + main.java.srcDirs = ["src/main/java"] + main.java.excludes = ["**/build/**"] + main.java.includes = ["**/*.java"] + main.res.srcDirs = ["src/main/res"] } buildTypes { @@ -73,10 +73,10 @@ androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR) androidTestImplementation(ESPRESSO_CORE) androidTestImplementation(project(":camera:camera-testing")) - androidTestImplementation(project(':internal-testutils-runtime')) + androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(TRUTH) debugImplementation(ANDROIDX_TEST_CORE) debugImplementation("androidx.fragment:fragment-testing:1.2.5") // Testing resource dependency for manifest debugImplementation(project(":camera:camera-testing")) -} \ No newline at end of file +}
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle index 642bf47..21c0089 100644 --- a/camera/integration-tests/viewtestapp/build.gradle +++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -32,11 +32,11 @@ } sourceSets { - main.manifest.srcFile 'src/main/AndroidManifest.xml' - main.java.srcDirs = ['src/main/java'] - main.java.excludes = ['**/build/**'] - main.java.includes = ['**/*.java'] - main.res.srcDirs = ['src/main/res'] + main.manifest.srcFile "src/main/AndroidManifest.xml" + main.java.srcDirs = ["src/main/java"] + main.java.excludes = ["**/build/**"] + main.java.includes = ["**/*.java"] + main.res.srcDirs = ["src/main/res"] } buildTypes { @@ -44,7 +44,7 @@ minifyEnabled true shrinkResources true proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), - 'proguard-rules.pro') + "proguard-rules.pro") } } }
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle index 1faab1a..9a6659f 100644 --- a/car/app/app/build.gradle +++ b/car/app/app/build.gradle
@@ -26,11 +26,11 @@ } dependencies { - implementation "androidx.activity:activity:1.1.0" - implementation "androidx.annotation:annotation:1.2.0-beta01" - implementation "androidx.core:core:1.3.0" - implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" + implementation("androidx.activity:activity:1.1.0") + implementation("androidx.annotation:annotation:1.2.0-beta01") + implementation("androidx.core:core:1.3.0") + implementation("androidx.lifecycle:lifecycle-viewmodel:2.2.0") + implementation("androidx.lifecycle:lifecycle-common-java8:2.2.0") // TODO(shiufai): We need this for assertThrows. Point back to the AndroidX shared version if // it is ever upgraded. @@ -58,7 +58,7 @@ aidl = true } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } testOptions.unitTests.includeAndroidResources = true
diff --git a/compose/androidview/androidview/build.gradle b/compose/androidview/androidview/build.gradle index 2e9e316..3b07959 100644 --- a/compose/androidview/androidview/build.gradle +++ b/compose/androidview/androidview/build.gradle
@@ -26,18 +26,18 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) // TODO: remove / refactor out reflection dependencies, this is a large dependency to bundle // with a library. implementation(KOTLIN_REFLECT) implementation(KOTLIN_STDLIB) - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") - implementation projectOrArtifact(":compose:runtime:runtime") - implementation projectOrArtifact(":compose:ui:ui") - implementation projectOrArtifact(":compose:ui:ui-test-junit4") + implementation(projectOrArtifact(":compose:runtime:runtime")) + implementation(projectOrArtifact(":compose:ui:ui")) + implementation(projectOrArtifact(":compose:ui:ui-test-junit4")) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle b/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle index 1537b40f..3cd419d 100644 --- a/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle +++ b/compose/androidview/androidview/integration-tests/androidview-demos/build.gradle
@@ -24,17 +24,17 @@ } dependencies { - implementation 'androidx.recyclerview:recyclerview:1.1.0' - kotlinPlugin project(":compose:compiler:compiler") + implementation("androidx.recyclerview:recyclerview:1.1.0") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:androidview:androidview") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation projectOrArtifact(":activity:activity-compose") - implementation "androidx.fragment:fragment-ktx:1.2.5" + implementation(project(":compose:androidview:androidview")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(projectOrArtifact(":activity:activity-compose")) + implementation("androidx.fragment:fragment-ktx:1.2.5") }
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle index eba431f..cbd4178 100644 --- a/compose/animation/animation-core/build.gradle +++ b/compose/animation/animation-core/build.gradle
@@ -31,7 +31,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -39,11 +39,11 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-unit") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-unit")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB) api(KOTLIN_COROUTINES_CORE) @@ -73,14 +73,14 @@ */ sourceSets { commonMain.dependencies { - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-unit") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-unit")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB_COMMON) api(KOTLIN_COROUTINES_CORE) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") implementation(KOTLIN_STDLIB) } desktopMain.dependencies { @@ -100,8 +100,8 @@ implementation(ANDROIDX_TEST_RUNNER) implementation(ANDROIDX_TEST_CORE) implementation(JUNIT) - implementation project(":compose:animation:animation") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:ui:ui-test-junit4")) } } }
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle index 71dacb6..e86627e 100644 --- a/compose/animation/animation-core/samples/build.gradle +++ b/compose/animation/animation-core/samples/build.gradle
@@ -27,16 +27,16 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:animation:animation-core") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-unit") - implementation project(':compose:foundation:foundation') - implementation project(':compose:material:material') + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:animation:animation-core")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-unit")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) } androidx {
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle index dd68ba8..ceca2a7 100644 --- a/compose/animation/animation/build.gradle +++ b/compose/animation/animation/build.gradle
@@ -30,7 +30,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -38,22 +38,22 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" - api project(":compose:animation:animation-core") - api project(":compose:foundation:foundation-layout") - api project(":compose:runtime:runtime") - api project(":compose:ui:ui") - api project(":compose:ui:ui-geometry") + api("androidx.annotation:annotation:1.1.0") + api(project(":compose:animation:animation-core")) + api(project(":compose:foundation:foundation-layout")) + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-geometry")) - implementation project(":compose:ui:ui-util") + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB_COMMON) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) - androidTestImplementation project(":compose:foundation:foundation") - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) @@ -73,17 +73,17 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:animation:animation-core") - api project(":compose:foundation:foundation-layout") - api project(":compose:runtime:runtime") - api project(":compose:ui:ui") - api project(":compose:ui:ui-geometry") + api(project(":compose:animation:animation-core")) + api(project(":compose:foundation:foundation-layout")) + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-geometry")) - implementation project(":compose:ui:ui-util") + implementation(project(":compose:ui:ui-util")) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } desktopMain.dependencies { @@ -100,8 +100,8 @@ implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) implementation(JUNIT) - implementation project(":compose:foundation:foundation") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:ui:ui-test-junit4")) } } }
diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle index 898109d..997a9ce 100644 --- a/compose/animation/animation/integration-tests/animation-demos/build.gradle +++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle
@@ -8,18 +8,18 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") - implementation project(':compose:animation:animation') - implementation project(':compose:animation:animation:animation-samples') - implementation project(':compose:animation:animation-core:animation-core-samples') - implementation project(':compose:foundation:foundation') - implementation project(':compose:material:material') + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) + implementation(project(":compose:animation:animation")) + implementation(project(":compose:animation:animation:animation-samples")) + implementation(project(":compose:animation:animation-core:animation-core-samples")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) }
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle index 66c6546..f7ad894 100644 --- a/compose/animation/animation/samples/build.gradle +++ b/compose/animation/animation/samples/build.gradle
@@ -27,17 +27,17 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-text") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-text")) } androidx {
diff --git a/compose/compiler/compiler-hosted/integration-tests/build.gradle b/compose/compiler/compiler-hosted/integration-tests/build.gradle index c399c67..2657faf 100644 --- a/compose/compiler/compiler-hosted/integration-tests/build.gradle +++ b/compose/compiler/compiler-hosted/integration-tests/build.gradle
@@ -66,9 +66,9 @@ unitTests.all { // There is only one version of the compose plugin built so the debug tests are // sufficient as they test that one version - if (it.name == 'testReleaseUnitTest') { + if (it.name == "testReleaseUnitTest") { filter { - exclude '*' + exclude "*" } } }
diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle index 5cb3d06..14a1c9a 100644 --- a/compose/desktop/desktop/build.gradle +++ b/compose/desktop/desktop/build.gradle
@@ -30,7 +30,7 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) } kotlin { @@ -41,11 +41,11 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:ui:ui-util") - api project(":compose:foundation:foundation") - api project(":compose:material:material") - api project(":compose:runtime:runtime") - api project(":compose:ui:ui") + implementation(project(":compose:ui:ui-util")) + api(project(":compose:foundation:foundation")) + api(project(":compose:material:material")) + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui")) } jvmMain.dependencies { @@ -60,7 +60,7 @@ dependencies { implementation(KOTLIN_COROUTINES_TEST) implementation(SKIKO_CURRENT_OS) - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:ui:ui-test-junit4")) implementation(JUNIT) implementation(TRUTH) } @@ -69,7 +69,7 @@ } tasks.findByName("jvmTest").configure { - systemProperties['GOLDEN_PATH'] = project.rootDir.absolutePath + "/../../golden" + systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden" } androidx { @@ -122,4 +122,4 @@ def projectPath = project.path rootProject.tasks.named(BUILD_ON_SERVER_TASK).configure { dependsOn("$projectPath:jvmJar") -} \ No newline at end of file +}
diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle index dacf54e..c6bf31f 100644 --- a/compose/desktop/desktop/samples/build.gradle +++ b/compose/desktop/desktop/samples/build.gradle
@@ -26,7 +26,7 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) } kotlin { @@ -40,14 +40,14 @@ jvmMain.dependencies { implementation(SKIKO_CURRENT_OS) - implementation project(":compose:desktop:desktop") + implementation(project(":compose:desktop:desktop")) } } } task run1(type: JavaExec) { dependsOn(":compose:desktop:desktop:jar") - main = 'androidx.compose.desktop.examples.example1.Main_jvmKt' + main = "androidx.compose.desktop.examples.example1.Main_jvmKt" systemProperty("skiko.fps.enabled", "true") def compilation = kotlin.jvm().compilations["main"] classpath = @@ -57,7 +57,7 @@ task run2(type: JavaExec) { dependsOn(":compose:desktop:desktop:jar") - main = 'androidx.compose.desktop.examples.example2.Main_jvmKt' + main = "androidx.compose.desktop.examples.example2.Main_jvmKt" def compilation = kotlin.jvm().compilations["main"] classpath = compilation.output.allOutputs + @@ -66,7 +66,7 @@ task run3(type: JavaExec) { dependsOn(":compose:desktop:desktop:jar") - main = 'androidx.compose.desktop.examples.popupexample.Main_jvmKt' + main = "androidx.compose.desktop.examples.popupexample.Main_jvmKt" def compilation = kotlin.jvm().compilations["main"] classpath = compilation.output.allOutputs + @@ -75,7 +75,7 @@ task run4(type: JavaExec) { dependsOn(":compose:desktop:desktop:jar") - main = 'androidx.compose.desktop.examples.swingexample.Main_jvmKt' + main = "androidx.compose.desktop.examples.swingexample.Main_jvmKt" def compilation = kotlin.jvm().compilations["main"] classpath = compilation.output.allOutputs + @@ -84,7 +84,7 @@ task runVsync(type: JavaExec) { dependsOn(":compose:desktop:desktop:jar") - main = 'androidx.compose.desktop.examples.vsynctest.Main_jvmKt' + main = "androidx.compose.desktop.examples.vsynctest.Main_jvmKt" jvmArgs("-verbose:gc") def compilation = kotlin.jvm().compilations["main"] classpath = @@ -99,4 +99,4 @@ def projectPath = project.path rootProject.tasks.named(BUILD_ON_SERVER_TASK).configure { dependsOn("$projectPath:jvmJar") -} \ No newline at end of file +}
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle index 60b295a..891e8a25 100644 --- a/compose/foundation/foundation-layout/build.gradle +++ b/compose/foundation/foundation-layout/build.gradle
@@ -14,7 +14,6 @@ * limitations under the License. */ - import androidx.build.AndroidXUiPlugin import androidx.build.LibraryGroups import androidx.build.Publish @@ -30,7 +29,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -38,20 +37,20 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" - api project(":compose:ui:ui") + api("androidx.annotation:annotation:1.1.0") + api(project(":compose:ui:ui")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB_COMMON) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) - androidTestImplementation project(":compose:foundation:foundation") - androidTestImplementation project(":compose:ui:ui-test-junit4") - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) + androidTestImplementation(project(":activity:activity-compose")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) @@ -72,13 +71,13 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + api(project(":compose:ui:ui")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } desktopMain.dependencies { @@ -92,9 +91,9 @@ } androidAndroidTest.dependencies { - implementation project(":compose:foundation:foundation") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":activity:activity-compose") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":activity:activity-compose")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER)
diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle index a278c67..1906796 100644 --- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle +++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
@@ -24,16 +24,16 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:foundation:foundation-layout:foundation-layout-samples") - implementation project(":compose:material:material") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:foundation:foundation-layout:foundation-layout-samples")) + implementation(project(":compose:material:material")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) }
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle index df9319f..40b91fe 100644 --- a/compose/foundation/foundation-layout/samples/build.gradle +++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -27,17 +27,17 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) } androidx {
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle index afda2ce..c96540c 100644 --- a/compose/foundation/foundation/build.gradle +++ b/compose/foundation/foundation/build.gradle
@@ -31,22 +31,22 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block above */ - api "androidx.annotation:annotation:1.1.0" - api project(':compose:animation:animation') - api project(':compose:runtime:runtime') - api project(':compose:ui:ui') + api("androidx.annotation:annotation:1.1.0") + api(project(':compose:animation:animation')) + api(project(':compose:runtime:runtime')) + api(project(':compose:ui:ui')) implementation(KOTLIN_STDLIB_COMMON) - implementation project(':compose:foundation:foundation-layout') - implementation project(":compose:ui:ui-text") - implementation project(':compose:ui:ui-util') + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:ui:ui-text")) + implementation(project(":compose:ui:ui-util")) testImplementation(ANDROIDX_TEST_RULES) @@ -56,13 +56,13 @@ testImplementation(KOTLIN_COROUTINES_TEST) testImplementation(MOCKITO_CORE) testImplementation(KOTLIN_REFLECT) - testImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + testImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) - androidTestImplementation project(":compose:test-utils") - androidTestImplementation project(":compose:ui:ui-test-font") - androidTestImplementation project(":test-screenshot") + androidTestImplementation(project(":compose:test-utils")) + androidTestImplementation(project(":compose:ui:ui-test-font")) + androidTestImplementation(project(":test-screenshot")) androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) @@ -73,9 +73,9 @@ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own // MockMaker androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } @@ -91,15 +91,15 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(':compose:animation:animation') - api project(':compose:runtime:runtime') - api project(':compose:ui:ui') - implementation project(":compose:ui:ui-text") - implementation project(":compose:ui:ui-util") - implementation project(':compose:foundation:foundation-layout') + api(project(':compose:animation:animation')) + api(project(':compose:runtime:runtime')) + api(project(':compose:ui:ui')) + implementation(project(":compose:ui:ui-text")) + implementation(project(":compose:ui:ui-util")) + implementation(project(':compose:foundation:foundation-layout')) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } desktopMain.dependencies { @@ -113,9 +113,9 @@ implementation(MOCKITO_CORE) implementation(TRUTH) implementation(KOTLIN_REFLECT) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } commonTest.dependencies { @@ -123,10 +123,10 @@ } androidAndroidTest.dependencies { - implementation project(":compose:test-utils") - implementation project(":compose:ui:ui-test-font") - implementation project(":test-screenshot") - implementation project(":activity:activity-compose") + implementation(project(":compose:test-utils")) + implementation(project(":compose:ui:ui-test-font")) + implementation(project(":test-screenshot")) + implementation(project(":activity:activity-compose")) implementation(ANDROIDX_TEST_UIAUTOMATOR) implementation(ANDROIDX_TEST_RULES) @@ -138,20 +138,20 @@ // MockMaker implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } desktopTest.dependencies { - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:ui:ui-test-junit4")) implementation(TRUTH) implementation(JUNIT) implementation(SKIKO_CURRENT_OS) implementation(MOCKITO_CORE) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle index 6424d46..7e36f32 100644 --- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle +++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
@@ -24,19 +24,19 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:foundation:foundation:foundation-samples") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") - implementation project(":compose:ui:ui-text:ui-text-samples") - implementation project(":paging:paging-compose:integration-tests:paging-demos") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:foundation:foundation:foundation-samples")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) + implementation(project(":compose:ui:ui-text:ui-text-samples")) + implementation(project(":paging:paging-compose:integration-tests:paging-demos")) }
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle index 0c2ff60..72c44d0c 100644 --- a/compose/foundation/foundation/samples/build.gradle +++ b/compose/foundation/foundation/samples/build.gradle
@@ -27,19 +27,19 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) } androidx {
diff --git a/compose/integration-tests/benchmark/build.gradle b/compose/integration-tests/benchmark/build.gradle index b59a2cf..e207b4e 100644 --- a/compose/integration-tests/benchmark/build.gradle +++ b/compose/integration-tests/benchmark/build.gradle
@@ -26,27 +26,27 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) - implementation project(":benchmark:benchmark-junit4") - implementation project(":benchmark:benchmark-macro-junit4") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":benchmark:benchmark-junit4")) + implementation(project(":benchmark:benchmark-macro-junit4")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-test-junit4")) implementation(KOTLIN_STDLIB) implementation(KOTLIN_REFLECT) implementation(ANDROIDX_TEST_RULES) implementation(JUNIT) implementation(TRUTH) - androidTestImplementation project(":compose:foundation:foundation-layout") - androidTestImplementation project(":compose:foundation:foundation") - androidTestImplementation project(":compose:material:material") - androidTestImplementation project(":compose:runtime:runtime") - androidTestImplementation project(":compose:test-utils") - androidTestImplementation project(":compose:ui:ui") - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation(project(":compose:foundation:foundation-layout")) + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:material:material")) + androidTestImplementation(project(":compose:runtime:runtime")) + androidTestImplementation(project(":compose:test-utils")) + androidTestImplementation(project(":compose:ui:ui")) + androidTestImplementation(project(":activity:activity-compose")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(KOTLIN_TEST_COMMON) androidTestImplementation(ANDROIDX_TEST_RULES)
diff --git a/compose/integration-tests/build.gradle b/compose/integration-tests/build.gradle index 967d4bb..69a9d8a 100644 --- a/compose/integration-tests/build.gradle +++ b/compose/integration-tests/build.gradle
@@ -25,7 +25,7 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) @@ -33,13 +33,13 @@ implementation(TRUTH) implementation(ANDROIDX_TEST_RULES) - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:test-utils") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:test-utils")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-test-junit4")) } androidx {
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle index 8366f18..1e0b1bd 100644 --- a/compose/integration-tests/demos/build.gradle +++ b/compose/integration-tests/demos/build.gradle
@@ -8,32 +8,32 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) - implementation project(":compose:androidview:androidview:integration-tests:androidview-demos") - implementation project(":compose:animation:animation:integration-tests:animation-demos") - implementation project(":compose:foundation:foundation-layout:integration-tests:foundation-layout-demos") - implementation project(":compose:foundation:foundation:integration-tests:foundation-demos") - implementation project(":compose:material:material:integration-tests:material-demos") - implementation project(":compose:material:material:integration-tests:material-catalog") - implementation project(":compose:material:material:integration-tests:material-studies") - implementation project(":navigation:navigation-compose:integration-tests:navigation-demos") - implementation project(":compose:ui:ui:integration-tests:ui-demos") + implementation(project(":compose:androidview:androidview:integration-tests:androidview-demos")) + implementation(project(":compose:animation:animation:integration-tests:animation-demos")) + implementation(project(":compose:foundation:foundation-layout:integration-tests:foundation-layout-demos")) + implementation(project(":compose:foundation:foundation:integration-tests:foundation-demos")) + implementation(project(":compose:material:material:integration-tests:material-demos")) + implementation(project(":compose:material:material:integration-tests:material-catalog")) + implementation(project(":compose:material:material:integration-tests:material-studies")) + implementation(project(":navigation:navigation-compose:integration-tests:navigation-demos")) + implementation(project(":compose:ui:ui:integration-tests:ui-demos")) implementation(KOTLIN_REFLECT) implementation(KOTLIN_STDLIB) - implementation project(":compose:androidview:androidview") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") + implementation(project(":compose:androidview:androidview")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) - implementation "androidx.preference:preference-ktx:1.1.1" + implementation("androidx.preference:preference-ktx:1.1.1") - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle index 7f783ed..76a62ae 100644 --- a/compose/integration-tests/demos/common/build.gradle +++ b/compose/integration-tests/demos/common/build.gradle
@@ -24,9 +24,9 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api "androidx.activity:activity:1.2.0" - implementation projectOrArtifact(":compose:runtime:runtime") + api("androidx.activity:activity:1.2.0") + implementation(projectOrArtifact(":compose:runtime:runtime")) }
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle index 82eb6e8..289c415 100644 --- a/compose/integration-tests/docs-snippets/build.gradle +++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -26,22 +26,21 @@ } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.activity:activity-ktx:1.1.0' + implementation("androidx.appcompat:appcompat:1.2.0") + implementation("androidx.activity:activity-ktx:1.1.0") - kotlinPlugin project(":compose:compiler:compiler") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:material:material-icons-extended") - implementation project(":compose:runtime:runtime") - implementation project(":compose:runtime:runtime-livedata") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":compose:ui:ui-tooling") - implementation project(":compose:ui:ui-viewbinding") - implementation project(":navigation:navigation-compose") - implementation project(":activity:activity-compose") - implementation project(":lifecycle:lifecycle-viewmodel-compose") - + kotlinPlugin(project(":compose:compiler:compiler")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:material:material-icons-extended")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:runtime:runtime-livedata")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":compose:ui:ui-tooling")) + implementation(project(":compose:ui:ui-viewbinding")) + implementation(project(":navigation:navigation-compose")) + implementation(project(":activity:activity-compose")) + implementation(project(":lifecycle:lifecycle-viewmodel-compose")) implementation(KOTLIN_STDLIB) implementation(KOTLIN_REFLECT)
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle index 466dd03..81f1431 100644 --- a/compose/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -12,21 +12,21 @@ release { minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-tooling") - implementation project(":activity:activity-compose") + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-tooling")) + implementation(project(":activity:activity-compose")) } android.defaultConfig.minSdkVersion 21
diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle index a72e284..c67b044 100644 --- a/compose/integration-tests/macrobenchmark/build.gradle +++ b/compose/integration-tests/macrobenchmark/build.gradle
@@ -29,7 +29,7 @@ android.defaultConfig { minSdkVersion 28 - testInstrumentationRunnerArgument 'androidx.benchmark.output.enable', 'true' + testInstrumentationRunnerArgument "androidx.benchmark.output.enable", "true" } dependencies { @@ -42,5 +42,5 @@ } // Define a task dependency so the app is installed before we run macro benchmarks. -tasks.getByPath(':compose:integration-tests:macrobenchmark:connectedCheck') - .dependsOn(tasks.getByPath(':compose:integration-tests:macrobenchmark-target:installRelease')) +tasks.getByPath(":compose:integration-tests:macrobenchmark:connectedCheck") + .dependsOn(tasks.getByPath(":compose:integration-tests:macrobenchmark-target:installRelease"))
diff --git a/compose/internal-lint-checks/build.gradle b/compose/internal-lint-checks/build.gradle index 8950d64..403eb2e 100644 --- a/compose/internal-lint-checks/build.gradle +++ b/compose/internal-lint-checks/build.gradle
@@ -32,13 +32,13 @@ apply(plugin:"com.github.johnrengelman.shadow") dependencies { - compileOnly LINT_API_LATEST - compileOnly KOTLIN_STDLIB - api project(":lint-checks") + compileOnly(LINT_API_LATEST) + compileOnly(KOTLIN_STDLIB) + api(project(":lint-checks")) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle index 5432445..ad390e0 100644 --- a/compose/material/material-icons-core/build.gradle +++ b/compose/material/material-icons-core/build.gradle
@@ -38,9 +38,9 @@ * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below */ - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) - api project(":compose:ui:ui") + api(project(":compose:ui:ui")) implementation(KOTLIN_STDLIB) } } @@ -57,7 +57,7 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui") + api(project(":compose:ui:ui")) } androidMain.dependencies {
diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle index 398b65f..dc2572c 100644 --- a/compose/material/material-icons-core/samples/build.gradle +++ b/compose/material/material-icons-core/samples/build.gradle
@@ -27,15 +27,15 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:material:material") - implementation project(":compose:material:material-icons-core") - implementation project(":compose:runtime:runtime") + implementation(project(":compose:material:material")) + implementation(project(":compose:material:material-icons-core")) + implementation(project(":compose:runtime:runtime")) } androidx {
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle index 3ca133e..d1d0196 100644 --- a/compose/material/material-icons-extended/build.gradle +++ b/compose/material/material-icons-extended/build.gradle
@@ -31,7 +31,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -39,10 +39,10 @@ * corresponding block below */ - api project(":compose:material:material-icons-core") + api(project(":compose:material:material-icons-core")) implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:runtime:runtime") + implementation(project(":compose:runtime:runtime")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) @@ -50,12 +50,12 @@ androidTestImplementation(KOTLIN_REFLECT) androidTestImplementation(TRUTH) - androidTestImplementation project(":compose:foundation:foundation") - androidTestImplementation project(":compose:foundation:foundation-layout") - androidTestImplementation project(":compose:ui:ui") - androidTestImplementation project(":test-screenshot") - androidTestImplementation project(":compose:ui:ui-test-junit4") - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:foundation:foundation-layout")) + androidTestImplementation(project(":compose:ui:ui")) + androidTestImplementation(project(":test-screenshot")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) + androidTestImplementation(project(":activity:activity-compose")) } } @@ -70,17 +70,17 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:material:material-icons-core") - implementation project(":compose:runtime:runtime") + api(project(":compose:material:material-icons-core")) + implementation(project(":compose:runtime:runtime")) } androidTest.dependencies { - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:ui:ui") - implementation project(":test-screenshot") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":activity:activity-compose") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:ui:ui")) + implementation(project(":test-screenshot")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":activity:activity-compose")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER)
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle index d67309b..e2cede2 100644 --- a/compose/material/material-ripple/build.gradle +++ b/compose/material/material-ripple/build.gradle
@@ -30,19 +30,19 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below */ - api project(":compose:foundation:foundation") - api project(":compose:runtime:runtime") + api(project(":compose:foundation:foundation")) + api(project(":compose:runtime:runtime")) implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:animation:animation") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:ui:ui-util")) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) @@ -63,11 +63,11 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:foundation:foundation") - api project(":compose:runtime:runtime") + api(project(":compose:foundation:foundation")) + api(project(":compose:runtime:runtime")) - implementation project(":compose:animation:animation") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:ui:ui-util")) } desktopMain.dependencies {
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle index 0383602..d8093ae 100644 --- a/compose/material/material/build.gradle +++ b/compose/material/material/build.gradle
@@ -30,43 +30,43 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below */ - api project(":compose:animation:animation-core") - api project(":compose:foundation:foundation") - api project(":compose:material:material-icons-core") - api project(":compose:material:material-ripple") - api project(":compose:runtime:runtime") - api project(":compose:ui:ui") - api project(":compose:ui:ui-text") + api(project(":compose:animation:animation-core")) + api(project(":compose:foundation:foundation")) + api(project(":compose:material:material-icons-core")) + api(project(":compose:material:material-ripple")) + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-text")) implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:ui:ui-util")) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) testImplementation(TRUTH) - androidTestImplementation project(":compose:material:material:material-samples") - androidTestImplementation project(":compose:test-utils") - androidTestImplementation project(":test-screenshot") + androidTestImplementation(project(":compose:material:material:material-samples")) + androidTestImplementation(project(":compose:test-utils")) + androidTestImplementation(project(":test-screenshot")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH) androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } @@ -82,21 +82,21 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:animation:animation-core") - api project(":compose:foundation:foundation") - api project(":compose:material:material-icons-core") - api project(":compose:material:material-ripple") - api project(":compose:runtime:runtime") - api project(":compose:ui:ui") - api project(":compose:ui:ui-text") + api(project(":compose:animation:animation-core")) + api(project(":compose:foundation:foundation")) + api(project(":compose:material:material-icons-core")) + api(project(":compose:material:material-ripple")) + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-text")) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:ui:ui-util")) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } desktopMain.dependencies { @@ -111,9 +111,9 @@ } androidAndroidTest.dependencies { - implementation project(":compose:material:material:material-samples") - implementation project(":compose:test-utils") - implementation project(":test-screenshot") + implementation(project(":compose:material:material:material-samples")) + implementation(project(":compose:test-utils")) + implementation(project(":test-screenshot")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) @@ -121,9 +121,9 @@ implementation(TRUTH) implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } }
diff --git a/compose/material/material/icons/generator/build.gradle b/compose/material/material/icons/generator/build.gradle index e00b45a..6a8e9f1 100644 --- a/compose/material/material/icons/generator/build.gradle +++ b/compose/material/material/icons/generator/build.gradle
@@ -28,7 +28,7 @@ } dependencies { - implementation gradleApi() + implementation(gradleApi()) implementation(AGP_STABLE) implementation(GUAVA)
diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle index d9c5445..9c120c1 100644 --- a/compose/material/material/integration-tests/material-demos/build.gradle +++ b/compose/material/material/integration-tests/material-demos/build.gradle
@@ -9,19 +9,19 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:androidview:androidview") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:material:material") - implementation project(":compose:material:material:material-samples") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") - implementation project(":activity:activity-compose") + implementation(project(":compose:androidview:androidview")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:material:material")) + implementation(project(":compose:material:material:material-samples")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) + implementation(project(":activity:activity-compose")) } androidx {
diff --git a/compose/material/material/integration-tests/material-studies/build.gradle b/compose/material/material/integration-tests/material-studies/build.gradle index f0c08e8..e3bfadb 100644 --- a/compose/material/material/integration-tests/material-studies/build.gradle +++ b/compose/material/material/integration-tests/material-studies/build.gradle
@@ -24,17 +24,17 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") - implementation project(':compose:material:material') - implementation project(":activity:activity-compose") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) + implementation(project(':compose:material:material')) + implementation(project(":activity:activity-compose")) }
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle index 20d75b7..ca04548 100644 --- a/compose/material/material/samples/build.gradle +++ b/compose/material/material/samples/build.gradle
@@ -27,19 +27,19 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) } androidx {
diff --git a/compose/runtime/runtime-lint/build.gradle b/compose/runtime/runtime-lint/build.gradle index 8e94048..aa6a9b5 100644 --- a/compose/runtime/runtime-lint/build.gradle +++ b/compose/runtime/runtime-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle index 6dd364b..3254423 100644 --- a/compose/runtime/runtime-livedata/build.gradle +++ b/compose/runtime/runtime-livedata/build.gradle
@@ -27,15 +27,15 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api project(":compose:runtime:runtime") - api "androidx.lifecycle:lifecycle-livedata:2.2.0" - implementation project(":compose:ui:ui") + api(project(":compose:runtime:runtime")) + api("androidx.lifecycle:lifecycle-livedata:2.2.0") + implementation(project(":compose:ui:ui")) - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle index a1eaf1c..0a78ea6 100644 --- a/compose/runtime/runtime-livedata/samples/build.gradle +++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -27,13 +27,13 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:foundation:foundation") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime-livedata") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime-livedata")) } androidx {
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle index 211d2d6..335c87f 100644 --- a/compose/runtime/runtime-rxjava2/build.gradle +++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -27,14 +27,14 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api project(":compose:runtime:runtime") + api(project(":compose:runtime:runtime")) api(RX_JAVA) - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle index 0870f6f..96fb0fe 100644 --- a/compose/runtime/runtime-rxjava2/samples/build.gradle +++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -27,13 +27,13 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:foundation:foundation") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime-rxjava2") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime-rxjava2")) } androidx {
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle index 0e4ec3e..5c079d6 100644 --- a/compose/runtime/runtime-rxjava3/build.gradle +++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -27,14 +27,14 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api project(":compose:runtime:runtime") + api(project(":compose:runtime:runtime")) api(RX_JAVA3) - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle index 2f648f3..d028c13 100644 --- a/compose/runtime/runtime-rxjava3/samples/build.gradle +++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -27,13 +27,13 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:foundation:foundation") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime-rxjava3") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime-rxjava3")) } androidx {
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle index ec98bf4..9d93bb9 100644 --- a/compose/runtime/runtime/build.gradle +++ b/compose/runtime/runtime/build.gradle
@@ -30,7 +30,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -40,24 +40,24 @@ api(KOTLIN_COROUTINES_ANDROID) - implementation "androidx.annotation:annotation:1.1.0" - implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3" + implementation("androidx.annotation:annotation:1.1.0") + implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3") implementation(KOTLIN_STDLIB) - testImplementation KOTLIN_TEST_JUNIT + testImplementation(KOTLIN_TEST_JUNIT) testImplementation(JUNIT) testImplementation(ROBOLECTRIC) testImplementation(KOTLIN_COROUTINES_TEST) - androidTestImplementation KOTLIN_TEST_JUNIT + androidTestImplementation(KOTLIN_TEST_JUNIT) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH) - lintChecks project(":compose:runtime:runtime-lint") - lintPublish project(":compose:runtime:runtime-lint") + lintChecks(project(":compose:runtime:runtime-lint")) + lintPublish(project(":compose:runtime:runtime-lint")) } } @@ -74,7 +74,7 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) implementation(KOTLIN_COROUTINES_CORE) - implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.3" + implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.3") } jvmMain.dependencies { implementation(KOTLIN_STDLIB) @@ -83,16 +83,16 @@ androidMain { dependencies { api(KOTLIN_COROUTINES_ANDROID) - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } - dependsOn jvmMain + dependsOn(jvmMain) } desktopMain { - dependsOn jvmMain + dependsOn(jvmMain) } commonTest.dependencies { - implementation kotlin("test-junit") + implementation(kotlin("test-junit")) implementation(KOTLIN_COROUTINES_TEST) } androidAndroidTest.dependencies {
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle index 2b8ee02..698b80d 100644 --- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle +++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -42,7 +42,7 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) androidTestImplementation(project(":compose:ui:ui")) androidTestImplementation(project(":compose:ui:ui-test-junit4")) @@ -60,6 +60,6 @@ androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(KOTLIN_REFLECT) androidTestImplementation(project(":benchmark:benchmark-junit4")) - androidTestImplementation "androidx.activity:activity:1.2.0" - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation("androidx.activity:activity:1.2.0") + androidTestImplementation(project(":activity:activity-compose")) }
diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle index 7174c30..78faeb9 100644 --- a/compose/runtime/runtime/integration-tests/build.gradle +++ b/compose/runtime/runtime/integration-tests/build.gradle
@@ -29,11 +29,11 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { androidTestImplementation(project(":compose:ui:ui")) - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(project(":compose:runtime:runtime")) androidTestImplementation(project(":activity:activity-compose")) @@ -71,26 +71,26 @@ androidMain { dependencies { api(KOTLIN_COROUTINES_ANDROID) - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") implementation("androidx.core:core-ktx:1.1.0") } - dependsOn jvmMain + dependsOn(jvmMain) } desktopMain { dependencies { api(KOTLIN_COROUTINES_SWING) } - dependsOn jvmMain + dependsOn(jvmMain) } commonTest.dependencies { - implementation kotlin("test-junit") + implementation(kotlin("test-junit")) } androidAndroidTest.dependencies { implementation(project(":compose:ui:ui")) - implementation project(":compose:ui:ui-test-junit4") - implementation project(":activity:activity-compose") + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":activity:activity-compose")) implementation(ANDROIDX_TEST_EXT_JUNIT) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER)
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle index 6b6f4f6..f2f2226 100644 --- a/compose/runtime/runtime/samples/build.gradle +++ b/compose/runtime/runtime/samples/build.gradle
@@ -27,15 +27,15 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) } androidx {
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle index 9e1a400..6c57480 100644 --- a/compose/test-utils/build.gradle +++ b/compose/test-utils/build.gradle
@@ -29,7 +29,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -37,24 +37,24 @@ * corresponding block below */ - api "androidx.activity:activity:1.2.0" - api project(":compose:ui:ui-test-junit4") - api project(":test-screenshot") + api("androidx.activity:activity:1.2.0") + api(project(":compose:ui:ui-test-junit4")) + api(project(":test-screenshot")) implementation(KOTLIN_STDLIB_COMMON) - implementation project(":benchmark:benchmark-junit4") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") + implementation(project(":benchmark:benchmark-junit4")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) implementation(ANDROIDX_TEST_RULES) // This has stub APIs for access to legacy Android APIs, so we don't want // any dependency on this module. - compileOnly project(":compose:ui:ui-android-stubs") + compileOnly(project(":compose:ui:ui-android-stubs")) testImplementation(TRUTH) androidTestImplementation(TRUTH) - androidTestImplementation project(':compose:material:material') + androidTestImplementation(project(":compose:material:material")) } } @@ -68,19 +68,19 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - implementation project(":benchmark:benchmark-junit4") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":benchmark:benchmark-junit4")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-test-junit4")) } androidMain.dependencies { - api "androidx.activity:activity:1.2.0" - api project(":compose:ui:ui-test-junit4") - api project(":test-screenshot") + api("androidx.activity:activity:1.2.0") + api(project(":compose:ui:ui-test-junit4")) + api(project(":test-screenshot")) // This has stub APIs for access to legacy Android APIs, so we don't want // any dependency on this module. - compileOnly project(":compose:ui:ui-android-stubs") + compileOnly(project(":compose:ui:ui-android-stubs")) implementation(ANDROIDX_TEST_RULES) } @@ -90,7 +90,7 @@ androidAndroidTest.dependencies { implementation(TRUTH) - implementation project(':compose:material:material') + implementation(project(":compose:material:material")) } } }
diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle index 58c21d3..94acbf8 100644 --- a/compose/ui/ui-geometry/build.gradle +++ b/compose/ui/ui-geometry/build.gradle
@@ -37,10 +37,10 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB) testImplementation(JUNIT) @@ -62,18 +62,18 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) } jvmMain.dependencies { implementation(KOTLIN_STDLIB) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } commonTest.dependencies { - implementation kotlin("test-junit") + implementation(kotlin("test-junit")) } } } @@ -92,4 +92,4 @@ kotlinOptions { freeCompilerArgs += ["-XXLanguage:+InlineClasses"] } -} \ No newline at end of file +}
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle index 6f211d8..958c380 100644 --- a/compose/ui/ui-graphics/build.gradle +++ b/compose/ui/ui-graphics/build.gradle
@@ -37,11 +37,11 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" - api project(":compose:ui:ui-unit") + api("androidx.annotation:annotation:1.1.0") + api(project(":compose:ui:ui-unit")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB_COMMON) testImplementation(ANDROIDX_TEST_RULES) @@ -49,9 +49,9 @@ testImplementation(JUNIT) testImplementation(TRUTH) - androidTestImplementation project(":compose:ui:ui-graphics:ui-graphics-samples") - androidTestImplementation project(":compose:ui:ui-test-junit4") - androidTestImplementation project(":compose:test-utils") + androidTestImplementation(project(":compose:ui:ui-graphics:ui-graphics-samples")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) + androidTestImplementation(project(":compose:test-utils")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ESPRESSO_CORE) @@ -74,13 +74,13 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui-unit") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + api(project(":compose:ui:ui-unit")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } desktopMain.dependencies { @@ -96,9 +96,9 @@ } androidAndroidTest.dependencies { - implementation project(":compose:ui:ui-graphics:ui-graphics-samples") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":compose:test-utils") + implementation(project(":compose:ui:ui-graphics:ui-graphics-samples")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":compose:test-utils")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) implementation(ESPRESSO_CORE) @@ -108,7 +108,7 @@ desktopTest { resources.srcDirs += "src/desktopTest/res" dependencies { - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:ui:ui-test-junit4")) implementation(JUNIT) implementation(TRUTH) implementation(SKIKO_CURRENT_OS) @@ -129,7 +129,7 @@ if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { tasks.findByName("desktopTest").configure { - systemProperties['GOLDEN_PATH'] = project.rootDir.absolutePath + "/../../golden" + systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden" } }
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle index 3443577..dbe40f4 100644 --- a/compose/ui/ui-graphics/samples/build.gradle +++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -27,17 +27,17 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - api project(":compose:ui:ui-unit") - implementation project(":compose:foundation:foundation") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-graphics") - implementation project(":compose:ui:ui-util") + api(project(":compose:ui:ui-unit")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-graphics")) + implementation(project(":compose:ui:ui-util")) } androidx {
diff --git a/compose/ui/ui-lint/build.gradle b/compose/ui/ui-lint/build.gradle index d7571e0..b76c7ac 100644 --- a/compose/ui/ui-lint/build.gradle +++ b/compose/ui/ui-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/compose/ui/ui-test-font/build.gradle b/compose/ui/ui-test-font/build.gradle index 995fd29..2b49397 100644 --- a/compose/ui/ui-test-font/build.gradle +++ b/compose/ui/ui-test-font/build.gradle
@@ -35,7 +35,7 @@ jvm("desktop") sourceSets { - desktopMain.dependsOn jvmMain + desktopMain.dependsOn(jvmMain) } } }
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle index 8b3e813..d9596ce 100644 --- a/compose/ui/ui-test-junit4/build.gradle +++ b/compose/ui/ui-test-junit4/build.gradle
@@ -30,11 +30,11 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { - api project(":compose:ui:ui-test") - api "androidx.activity:activity:1.2.0" + api(project(":compose:ui:ui-test")) + api("androidx.activity:activity:1.2.0") api(ANDROIDX_TEST_EXT_JUNIT) api(JUNIT) @@ -42,20 +42,20 @@ implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) implementation(ESPRESSO_CORE) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) testImplementation(TRUTH) - androidTestImplementation project(':compose:test-utils') - androidTestImplementation project(':compose:material:material') - androidTestImplementation project(':compose:foundation:foundation') + androidTestImplementation(project(":compose:test-utils")) + androidTestImplementation(project(":compose:material:material")) + androidTestImplementation(project(":compose:foundation:foundation")) androidTestImplementation(TRUTH) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } @@ -67,22 +67,22 @@ sourceSets { commonMain.dependencies { - api project(":compose:ui:ui-test") - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") + api(project(":compose:ui:ui-test")) + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) implementation(KOTLIN_STDLIB_COMMON) } jvmMain.dependencies { - implementation "androidx.collection:collection:1.1.0" + implementation("androidx.collection:collection:1.1.0") implementation(JUNIT) } androidMain.dependencies { api(JUNIT) api(ANDROIDX_TEST_EXT_JUNIT) - api "androidx.activity:activity:1.2.0" + api("androidx.activity:activity:1.2.0") implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) @@ -95,15 +95,15 @@ androidAndroidTest.dependencies { implementation(TRUTH) - implementation project(':compose:test-utils') - implementation project(':compose:foundation:foundation') - implementation project(':compose:material:material') + implementation(project(":compose:test-utils")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } desktopMain.dependencies { @@ -112,8 +112,8 @@ implementation(SKIKO) } - desktopMain.dependsOn jvmMain - jvmMain.dependsOn commonMain + desktopMain.dependsOn(jvmMain) + jvmMain.dependsOn(commonMain) } } }
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle index 991f7b8..6848517 100644 --- a/compose/ui/ui-test/build.gradle +++ b/compose/ui/ui-test/build.gradle
@@ -30,35 +30,35 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { - api project(":compose:ui:ui") - api project(":compose:ui:ui-graphics") - api project(":compose:ui:ui-geometry") - api project(":compose:ui:ui-text") - api project(":compose:ui:ui-unit") - api project(":compose:ui:ui-util") - api project(":compose:runtime:runtime") + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-graphics")) + api(project(":compose:ui:ui-geometry")) + api(project(":compose:ui:ui-text")) + api(project(":compose:ui:ui-unit")) + api(project(":compose:ui:ui-util")) + api(project(":compose:runtime:runtime")) api(KOTLIN_COROUTINES_TEST) implementation(KOTLIN_STDLIB) implementation(ESPRESSO_CORE) - implementation "androidx.collection:collection:1.1.0" - implementation project(":compose:runtime:runtime") + implementation("androidx.collection:collection:1.1.0") + implementation(project(":compose:runtime:runtime")) testImplementation(TRUTH) - androidTestImplementation project(':compose:material:material') - androidTestImplementation project(':compose:test-utils') - androidTestImplementation project(':compose:ui:ui-test-junit4') - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation(project(':compose:material:material')) + androidTestImplementation(project(':compose:test-utils')) + androidTestImplementation(project(':compose:ui:ui-test-junit4')) + androidTestImplementation(project(":activity:activity-compose")) androidTestImplementation(TRUTH) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } } @@ -70,25 +70,25 @@ sourceSets { commonMain.dependencies { - api project(":compose:ui:ui") - api project(":compose:ui:ui-geometry") - api project(":compose:ui:ui-text") - api project(":compose:ui:ui-unit") - api project(":compose:ui:ui-util") + api(project(":compose:ui:ui")) + api(project(":compose:ui:ui-geometry")) + api(project(":compose:ui:ui-text")) + api(project(":compose:ui:ui-unit")) + api(project(":compose:ui:ui-util")) api(KOTLIN_COROUTINES_TEST) implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:runtime:runtime") + implementation(project(":compose:runtime:runtime")) } jvmMain.dependencies { - implementation "androidx.collection:collection:1.1.0" + implementation("androidx.collection:collection:1.1.0") } androidMain.dependencies { - api project(":compose:runtime:runtime") - api project(":compose:ui:ui-graphics") + api(project(":compose:runtime:runtime")) + api(project(":compose:ui:ui-graphics")) implementation(ESPRESSO_CORE) } @@ -99,16 +99,16 @@ androidAndroidTest.dependencies { implementation(TRUTH) - implementation project(':compose:material:material') - implementation project(':compose:test-utils') - implementation project(':compose:ui:ui-test-junit4') - implementation project(":activity:activity-compose") + implementation(project(":compose:material:material")) + implementation(project(":compose:test-utils")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":activity:activity-compose")) implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } desktopMain.dependencies { @@ -117,8 +117,8 @@ implementation(SKIKO) } - desktopMain.dependsOn jvmMain - jvmMain.dependsOn commonMain + desktopMain.dependsOn(jvmMain) + jvmMain.dependsOn(commonMain) } } }
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle index 5acd284..41b0a4c 100644 --- a/compose/ui/ui-text/build.gradle +++ b/compose/ui/ui-text/build.gradle
@@ -38,30 +38,30 @@ */ implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui-graphics") - api project(":compose:ui:ui-unit") - api "androidx.annotation:annotation:1.1.0" + api(project(":compose:ui:ui-graphics")) + api(project(":compose:ui:ui-unit")) + api("androidx.annotation:annotation:1.1.0") - implementation project(":compose:runtime:runtime") - implementation project(":compose:runtime:runtime-saveable") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:runtime:runtime-saveable")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB) - implementation "androidx.collection:collection:1.1.0" - implementation "androidx.core:core:1.5.0-beta01" + implementation("androidx.collection:collection:1.1.0") + implementation("androidx.core:core:1.5.0-beta01") - testImplementation project(":compose:ui:ui-test-font") + testImplementation(project(":compose:ui:ui-test-font")) testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) testImplementation(MOCKITO_CORE) testImplementation(TRUTH) testImplementation(KOTLIN_REFLECT) - testImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + testImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) - androidTestImplementation project(":compose:ui:ui-test-font") - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-font")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ESPRESSO_CORE) @@ -70,9 +70,9 @@ // DexMaker has it"s own MockMaker androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) androidTestImplementation(TRUTH) - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } android { @@ -97,44 +97,44 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui-graphics") - api project(":compose:ui:ui-unit") + api(project(":compose:ui:ui-graphics")) + api(project(":compose:ui:ui-unit")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:runtime:runtime-saveable") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:runtime:runtime-saveable")) + implementation(project(":compose:ui:ui-util")) } jvmMain.dependencies { implementation(KOTLIN_STDLIB) } - desktopMain.dependsOn jvmMain + desktopMain.dependsOn(jvmMain) androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" - implementation "androidx.collection:collection:1.1.0" - implementation "androidx.core:core:1.5.0-beta01" + api("androidx.annotation:annotation:1.1.0") + implementation("androidx.collection:collection:1.1.0") + implementation("androidx.core:core:1.5.0-beta01") } androidMain.kotlin.srcDirs("../../../text/text/src/main/java") androidTest.dependencies { - implementation project(":compose:ui:ui-test-font") + implementation(project(":compose:ui:ui-test-font")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) implementation(JUNIT) implementation(MOCKITO_CORE) implementation(TRUTH) implementation(KOTLIN_REFLECT) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } androidAndroidTest.dependencies { - implementation project(":compose:ui:ui-test-junit4") - implementation project(":compose:ui:ui-test-font") + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":compose:ui:ui-test-font")) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) implementation(ESPRESSO_CORE) @@ -143,18 +143,18 @@ // DexMaker has it"s own MockMaker implementation(MOCKITO_CORE, libs.exclude_bytebuddy) implementation(TRUTH) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } desktopTest.dependencies { implementation(TRUTH) implementation(JUNIT) implementation(SKIKO_CURRENT_OS) - implementation project(":compose:foundation:foundation") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":compose:ui:ui-test-font") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":compose:ui:ui-test-font")) } } }
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle index 97789d8..24c51c8 100644 --- a/compose/ui/ui-text/samples/build.gradle +++ b/compose/ui/ui-text/samples/build.gradle
@@ -27,17 +27,17 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:foundation:foundation") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) } androidx {
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle index 775dfd2..1fdfb45 100644 --- a/compose/ui/ui-tooling/build.gradle +++ b/compose/ui/ui-tooling/build.gradle
@@ -27,11 +27,11 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") api(project(":compose:runtime:runtime")) api(project(":compose:ui:ui")) @@ -43,13 +43,13 @@ compileOnly(project(":ui:ui-animation-tooling-internal")) compileOnly(KOTLIN_REFLECT) - androidTestImplementation project(":compose:ui:ui-test-junit4") + androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(JUNIT) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) - androidTestImplementation project(":compose:foundation:foundation-layout") - androidTestImplementation project(":compose:foundation:foundation") + androidTestImplementation(project(":compose:foundation:foundation-layout")) + androidTestImplementation(project(":compose:foundation:foundation")) androidTestImplementation(TRUTH) androidTestImplementation(KOTLIN_REFLECT) androidTestImplementation(project(":ui:ui-animation-tooling-internal"))
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle index 63c8cbd..58994dd 100644 --- a/compose/ui/ui-unit/build.gradle +++ b/compose/ui/ui-unit/build.gradle
@@ -37,12 +37,12 @@ * corresponding block below */ - api project(":compose:ui:ui-geometry") - api "androidx.annotation:annotation:1.1.0" + api(project(":compose:ui:ui-geometry")) + api("androidx.annotation:annotation:1.1.0") implementation(KOTLIN_STDLIB) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) testImplementation(JUNIT) testImplementation(TRUTH) @@ -68,20 +68,20 @@ sourceSets { commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - api project(":compose:ui:ui-geometry") + api(project(":compose:ui:ui-geometry")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) } jvmMain.dependencies { implementation(KOTLIN_STDLIB) } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } commonTest.dependencies { - implementation kotlin("test-junit") + implementation(kotlin("test-junit")) } androidTest.dependencies {
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle index dfa93c3..f97eb58 100644 --- a/compose/ui/ui-unit/samples/build.gradle +++ b/compose/ui/ui-unit/samples/build.gradle
@@ -27,15 +27,15 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-unit") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-unit")) } androidx {
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle index 71439fe..aae1bab 100644 --- a/compose/ui/ui-util/build.gradle +++ b/compose/ui/ui-util/build.gradle
@@ -37,10 +37,10 @@ * corresponding block below */ - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") implementation(KOTLIN_STDLIB) - implementation project(":compose:runtime:runtime") + implementation(project(":compose:runtime:runtime")) testImplementation(JUNIT) testImplementation(TRUTH) @@ -61,7 +61,7 @@ commonMain.dependencies { implementation(KOTLIN_STDLIB_COMMON) - implementation project(":compose:runtime:runtime") + implementation(project(":compose:runtime:runtime")) } jvmMain.dependencies { @@ -69,13 +69,13 @@ } androidMain.dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") } - desktopMain.dependsOn jvmMain + desktopMain.dependsOn(jvmMain) commonTest.dependencies { - implementation kotlin("test-junit") + implementation(kotlin("test-junit")) } androidTest.dependencies {
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle index 5912b16..1351db4 100644 --- a/compose/ui/ui-viewbinding/build.gradle +++ b/compose/ui/ui-viewbinding/build.gradle
@@ -27,13 +27,13 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:ui:ui") + implementation(project(":compose:ui:ui")) - androidTestImplementation project(':compose:foundation:foundation') - androidTestImplementation project(":compose:test-utils") + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:test-utils")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle index 520a897..93545c3 100644 --- a/compose/ui/ui-viewbinding/samples/build.gradle +++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -27,13 +27,13 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-viewbinding") + compileOnly(project(":annotation:annotation-sampled")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-viewbinding")) } androidx {
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index b2343a3..996054c 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle
@@ -32,7 +32,7 @@ AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { /* @@ -44,30 +44,30 @@ // TODO: b/160602714 create a lower level module to avoid this dependency on the // animation group - api project(":compose:animation:animation-core") - api project(":compose:runtime:runtime-saveable") - api project(":compose:ui:ui-geometry") - api project(":compose:ui:ui-graphics") - api project(":compose:ui:ui-text") - api project(":compose:ui:ui-unit") - api "androidx.annotation:annotation:1.1.0" + api(project(":compose:animation:animation-core")) + api(project(":compose:runtime:runtime-saveable")) + api(project(":compose:ui:ui-geometry")) + api(project(":compose:ui:ui-graphics")) + api(project(":compose:ui:ui-text")) + api(project(":compose:ui:ui-unit")) + api("androidx.annotation:annotation:1.1.0") // This has stub APIs for access to legacy Android APIs, so we don't want // any dependency on this module. - compileOnly project(":compose:ui:ui-android-stubs") + compileOnly(project(":compose:ui:ui-android-stubs")) - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) implementation(KOTLIN_STDLIB) - implementation "androidx.autofill:autofill:1.0.0" + implementation("androidx.autofill:autofill:1.0.0") implementation(KOTLIN_COROUTINES_ANDROID) // we don't use these dependencies but we need to ensure at least these versions are // used if the user adds these dependencies as otherwise AppCompatActivity and Fragment // will not propagate ViewTree*Owners we are relying on and we will crash. // TODO: remove these dependencies at some point: b/161814404 - implementation "androidx.fragment:fragment:1.3.0" - implementation "androidx.appcompat:appcompat:1.3.0-beta01" + implementation("androidx.fragment:fragment:1.3.0") + implementation("androidx.appcompat:appcompat:1.3.0-beta01") testImplementation(ANDROIDX_TEST_RULES) testImplementation(ANDROIDX_TEST_RUNNER) @@ -75,15 +75,15 @@ testImplementation(JUNIT) testImplementation(TRUTH) testImplementation(MOCKITO_CORE) - testImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + testImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) testImplementation(ROBOLECTRIC) - testImplementation project(":compose:ui:ui-test-junit4") - testImplementation project(":compose:test-utils") + testImplementation(project(":compose:ui:ui-test-junit4")) + testImplementation(project(":compose:test-utils")) - androidTestImplementation "androidx.fragment:fragment:1.3.0" - androidTestImplementation "androidx.appcompat:appcompat:1.1.0" + androidTestImplementation("androidx.fragment:fragment:1.3.0") + androidTestImplementation("androidx.appcompat:appcompat:1.1.0") androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) @@ -96,21 +96,21 @@ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(TRUTH) - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } - androidTestImplementation project(":compose:foundation:foundation") - androidTestImplementation project(":compose:foundation:foundation-layout") - androidTestImplementation project(":compose:test-utils") - androidTestImplementation project(":compose:ui:ui-test-font") - androidTestImplementation project(":compose:ui:ui-test-junit4") - androidTestImplementation project(":test-screenshot") - androidTestImplementation "androidx.recyclerview:recyclerview:1.1.0" + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) + androidTestImplementation(project(":compose:foundation:foundation")) + androidTestImplementation(project(":compose:foundation:foundation-layout")) + androidTestImplementation(project(":compose:test-utils")) + androidTestImplementation(project(":compose:ui:ui-test-font")) + androidTestImplementation(project(":compose:ui:ui-test-junit4")) + androidTestImplementation(project(":test-screenshot")) + androidTestImplementation("androidx.recyclerview:recyclerview:1.1.0") androidTestImplementation("androidx.core:core-ktx:1.1.0") - androidTestImplementation project(":activity:activity-compose") + androidTestImplementation(project(":activity:activity-compose")) - lintChecks project(":compose:ui:ui-lint") - lintPublish project(":compose:ui:ui-lint") + lintChecks(project(":compose:ui:ui-lint")) + lintPublish(project(":compose:ui:ui-lint")) } } @@ -138,37 +138,37 @@ api project(":compose:ui:ui-graphics") api project(":compose:ui:ui-text") api project(":compose:ui:ui-unit") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui-util") + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui-util")) } androidMain.dependencies { implementation(KOTLIN_STDLIB) // This has stub APIs for access to legacy Android APIs, so we don't want // any dependency on this module. - compileOnly project(":compose:ui:ui-android-stubs") - api "androidx.annotation:annotation:1.1.0" - implementation "androidx.autofill:autofill:1.0.0" + compileOnly(project(":compose:ui:ui-android-stubs")) + api("androidx.annotation:annotation:1.1.0") + implementation("androidx.autofill:autofill:1.0.0") implementation(KOTLIN_COROUTINES_ANDROID) // we don't use these dependencies but we need to ensure at least these versions are // used if the user adds these dependencies as otherwise AppCompatActivity and Fragment // will not propagate ViewTree*Owners we are relying on and we will crash. // TODO: remove these dependencies at some point: b/161814404 - implementation "androidx.fragment:fragment:1.3.0" - implementation "androidx.appcompat:appcompat:1.3.0-beta01" + implementation("androidx.fragment:fragment:1.3.0") + implementation("androidx.appcompat:appcompat:1.3.0-beta01") } jvmMain.dependencies { implementation(KOTLIN_STDLIB) } - androidMain.dependsOn jvmMain + androidMain.dependsOn(jvmMain) desktopMain { dependencies { api(KOTLIN_COROUTINES_SWING) } - dependsOn jvmMain + dependsOn(jvmMain) } test.dependencies { @@ -178,17 +178,17 @@ implementation(JUNIT) implementation(TRUTH) implementation(MOCKITO_CORE) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) implementation(ROBOLECTRIC) - implementation project(":compose:ui:ui-test-junit4") - implementation project(":compose:test-utils") + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":compose:test-utils")) } androidAndroidTest.dependencies { - implementation "androidx.fragment:fragment:1.3.0" - implementation "androidx.appcompat:appcompat:1.1.0" + implementation("androidx.fragment:fragment:1.3.0") + implementation("androidx.appcompat:appcompat:1.1.0") implementation(ANDROIDX_TEST_UIAUTOMATOR) implementation(ANDROIDX_TEST_RULES) implementation(ANDROIDX_TEST_RUNNER) @@ -201,30 +201,30 @@ implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker implementation(TRUTH) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:test-utils") - implementation project(":compose:ui:ui-test-font") - implementation project(":compose:ui:ui-test-junit4") - implementation project(":test-screenshot") - implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:test-utils")) + implementation(project(":compose:ui:ui-test-font")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":test-screenshot")) + implementation("androidx.recyclerview:recyclerview:1.1.0") implementation("androidx.core:core-ktx:1.1.0") - implementation project(":activity:activity-compose") + implementation(project(":activity:activity-compose")) } desktopTest.dependencies { implementation(TRUTH) implementation(JUNIT) implementation(MOCKITO_CORE) - implementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + implementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) implementation(SKIKO_CURRENT_OS) - implementation project(":compose:foundation:foundation") - implementation project(":compose:ui:ui-test-junit4") + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:ui:ui-test-junit4")) } } } @@ -241,7 +241,7 @@ if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { tasks.findByName("desktopTest").configure { - systemProperties['GOLDEN_PATH'] = project.rootDir.absolutePath + "/../../golden" + systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden" } }
diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle index 8db147c..883af2f 100644 --- a/compose/ui/ui/integration-tests/ui-demos/build.gradle +++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle
@@ -8,21 +8,21 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation project(":compose:animation:animation") - implementation project(":compose:foundation:foundation") - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:integration-tests:demos:common") - implementation project(":compose:ui:ui:ui-samples") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:runtime:runtime-livedata") - implementation project(":compose:ui:ui") - implementation project(":compose:ui:ui-text") - implementation project(":compose:ui:ui-viewbinding") + implementation(project(":compose:animation:animation")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:integration-tests:demos:common")) + implementation(project(":compose:ui:ui:ui-samples")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:runtime:runtime-livedata")) + implementation(project(":compose:ui:ui")) + implementation(project(":compose:ui:ui-text")) + implementation(project(":compose:ui:ui-viewbinding")) } android {
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle index 936f1b7..45017b9 100644 --- a/compose/ui/ui/samples/build.gradle +++ b/compose/ui/ui/samples/build.gradle
@@ -27,16 +27,16 @@ } dependencies { - kotlinPlugin project(":compose:compiler:compiler") + kotlinPlugin(project(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) - implementation project(":compose:foundation:foundation-layout") - implementation project(":compose:material:material") - implementation project(":compose:runtime:runtime") - implementation project(":compose:ui:ui") + implementation(project(":compose:foundation:foundation-layout")) + implementation(project(":compose:material:material")) + implementation(project(":compose:runtime:runtime")) + implementation(project(":compose:ui:ui")) } androidx {
diff --git a/coordinatorlayout/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle index 202d484..98639d0 100644 --- a/coordinatorlayout/coordinatorlayout/build.gradle +++ b/coordinatorlayout/coordinatorlayout/build.gradle
@@ -22,9 +22,9 @@ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.coordinatorlayout', module: 'coordinatorlayout' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.coordinatorlayout", module: "coordinatorlayout" + }) } android { @@ -34,12 +34,12 @@ } sourceSets { main.res.srcDirs = [ - 'src/main/res', - 'src/main/res-public' + "src/main/res", + "src/main/res-public" ] } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/core/core/build.gradle b/core/core/build.gradle index 93d72bd..3f0fdc5 100644 --- a/core/core/build.gradle +++ b/core/core/build.gradle
@@ -34,12 +34,12 @@ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO_INLINE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation("androidx.appcompat:appcompat:1.1.0") { - exclude group: 'androidx.core', module: 'core' + exclude group: "androidx.core", module: "core" } - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.core', module: 'core' - } - androidTestImplementation project(':internal-testutils-mockito') + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.core", module: "core" + }) + androidTestImplementation(project(":internal-testutils-mockito")) testImplementation(ANDROIDX_TEST_CORE) testImplementation(ANDROIDX_TEST_RUNNER) @@ -57,10 +57,10 @@ targetCompatibility = JavaVersion.VERSION_1_7 } aaptOptions { - noCompress 'ttf' + noCompress "ttf" } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } packagingOptions {
diff --git a/datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle b/datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle index 70ce966..4c60018 100644 --- a/datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle +++ b/datastore/datastore-preferences-core/datastore-preferences-proto/build.gradle
@@ -41,7 +41,7 @@ all().each { task -> task.builtins { java { - option 'lite' + option "lite" } } }
diff --git a/datastore/datastore-preferences-rxjava2/build.gradle b/datastore/datastore-preferences-rxjava2/build.gradle index 9782a40..e8b6ab0 100644 --- a/datastore/datastore-preferences-rxjava2/build.gradle +++ b/datastore/datastore-preferences-rxjava2/build.gradle
@@ -28,8 +28,8 @@ android { sourceSets { - test.java.srcDirs += 'src/test-common/java' - androidTest.java.srcDirs += 'src/test-common/java' + test.java.srcDirs += "src/test-common/java" + androidTest.java.srcDirs += "src/test-common/java" } }
diff --git a/datastore/datastore-preferences-rxjava3/build.gradle b/datastore/datastore-preferences-rxjava3/build.gradle index 44af2c9..25274df 100644 --- a/datastore/datastore-preferences-rxjava3/build.gradle +++ b/datastore/datastore-preferences-rxjava3/build.gradle
@@ -28,8 +28,8 @@ android { sourceSets { - test.java.srcDirs += 'src/test-common/java' - androidTest.java.srcDirs += 'src/test-common/java' + test.java.srcDirs += "src/test-common/java" + androidTest.java.srcDirs += "src/test-common/java" } }
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle index 7785c9a..5197a49 100644 --- a/datastore/datastore-preferences/build.gradle +++ b/datastore/datastore-preferences/build.gradle
@@ -33,7 +33,7 @@ android{ buildTypes.all{ - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/datastore/datastore-proto/build.gradle b/datastore/datastore-proto/build.gradle index a7457b8..83313e5 100644 --- a/datastore/datastore-proto/build.gradle +++ b/datastore/datastore-proto/build.gradle
@@ -49,7 +49,7 @@ all().each { task -> task.builtins { java { - option 'lite' + option "lite" } } }
diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle index 83003c2..eb31aa4 100644 --- a/datastore/datastore-rxjava2/build.gradle +++ b/datastore/datastore-rxjava2/build.gradle
@@ -28,8 +28,8 @@ android { sourceSets { - test.java.srcDirs += 'src/test-common/java' - androidTest.java.srcDirs += 'src/test-common/java' + test.java.srcDirs += "src/test-common/java" + androidTest.java.srcDirs += "src/test-common/java" } }
diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle index 9f8e453..645e4d51 100644 --- a/datastore/datastore-rxjava3/build.gradle +++ b/datastore/datastore-rxjava3/build.gradle
@@ -28,8 +28,8 @@ android { sourceSets { - test.java.srcDirs += 'src/test-common/java' - androidTest.java.srcDirs += 'src/test-common/java' + test.java.srcDirs += "src/test-common/java" + androidTest.java.srcDirs += "src/test-common/java" } }
diff --git a/datastore/datastore-sampleapp/build.gradle b/datastore/datastore-sampleapp/build.gradle index 5e6e422..9867655 100644 --- a/datastore/datastore-sampleapp/build.gradle +++ b/datastore/datastore-sampleapp/build.gradle
@@ -22,7 +22,7 @@ plugins { id("AndroidXPlugin") - id('com.android.application') + id("com.android.application") id("org.jetbrains.kotlin.android") id("com.google.protobuf") id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.21' @@ -51,7 +51,7 @@ // For kotlin serialization implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1") - compileOnly project(":annotation:annotation-sampled") + compileOnly(project(":annotation:annotation-sampled")) } protobuf { @@ -66,7 +66,7 @@ all().each { task -> task.builtins { java { - option 'lite' + option "lite" } } } @@ -78,4 +78,4 @@ kotlinOptions { freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] } -} \ No newline at end of file +}
diff --git a/development/checkstyle/build.gradle b/development/checkstyle/build.gradle index 52a9305..1121887 100644 --- a/development/checkstyle/build.gradle +++ b/development/checkstyle/build.gradle
@@ -1,4 +1,4 @@ -apply plugin: 'java' +apply plugin: "java" compileJava { sourceCompatibility = JavaVersion.VERSION_1_7 @@ -6,11 +6,11 @@ } dependencies { - compile files('../../../../prebuilts/checkstyle/checkstyle.jar') + compile files("../../../../prebuilts/checkstyle/checkstyle.jar") } sourceSets { - main.java.srcDir 'src' + main.java.srcDir "src" } jar {
diff --git a/docs-public/build.gradle b/docs-public/build.gradle index 5af7127b..c8a463d 100644 --- a/docs-public/build.gradle +++ b/docs-public/build.gradle
@@ -28,7 +28,7 @@ docs("androidx.camera:camera-camera2:1.1.0-alpha01") docs("androidx.camera:camera-core:1.1.0-alpha01") docs("androidx.camera:camera-extensions:1.0.0-alpha21") - stubs(fileTree(dir: '../camera/camera-extensions-stub', include: ['camera-extensions-stub.jar'])) + stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"])) docs("androidx.camera:camera-lifecycle:1.1.0-alpha01") docs("androidx.camera:camera-view:1.0.0-alpha21") docs("androidx.cardview:cardview:1.0.0") @@ -216,7 +216,7 @@ docs("androidx.viewpager2:viewpager2:1.1.0-alpha01") docs("androidx.viewpager:viewpager:1.0.0") docs("androidx.wear:wear:1.2.0-alpha06") - stubs(fileTree(dir: '../wear/wear_stubs/', include: ['com.google.android.wearable-stubs.jar'])) + stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"])) docs("androidx.wear:wear-complications-data:1.0.0-alpha07") docs("androidx.wear:wear-complications-provider:1.0.0-alpha07") docs("androidx.wear:wear-ongoing:1.0.0-alpha02") @@ -233,7 +233,7 @@ docs("androidx.wear:wear-input-testing:1.1.0-alpha01") docs("androidx.webkit:webkit:1.4.0") docs("androidx.window:window:1.0.0-alpha03") - stubs(fileTree(dir: '../window/stubs/', include: ['window-sidecar-release-0.1.0-alpha01.aar'])) + stubs(fileTree(dir: "../window/stubs/", include: ["window-sidecar-release-0.1.0-alpha01.aar"])) stubs(project(":window:window-extensions")) docs("androidx.work:work-gcm:2.7.0-alpha01") docs("androidx.work:work-multiprocess:2.7.0-alpha01")
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle index c792903..7075406 100644 --- a/docs-tip-of-tree/build.gradle +++ b/docs-tip-of-tree/build.gradle
@@ -35,7 +35,7 @@ docs(project(":camera:camera-camera2")) docs(project(":camera:camera-core")) docs(project(":camera:camera-extensions")) - stubs(fileTree(dir: '../camera/camera-extensions-stub', include: ['camera-extensions-stub.jar'])) + stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"])) docs(project(":camera:camera-lifecycle")) docs(project(":camera:camera-view")) docs(project(":car:app:app")) @@ -236,7 +236,7 @@ docs(project(":viewpager2:viewpager2")) docs(project(":viewpager:viewpager")) docs(project(":wear:wear")) - stubs(fileTree(dir: '../wear/wear_stubs/', include: ['com.google.android.wearable-stubs.jar'])) + stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"])) docs(project(":wear:wear-complications-data")) docs(project(":wear:wear-complications-provider")) docs(project(":wear:wear-input"))
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle index 2d14f26..46412ca 100644 --- a/emoji/appcompat/build.gradle +++ b/emoji/appcompat/build.gradle
@@ -35,4 +35,4 @@ mavenGroup = LibraryGroups.EMOJI inceptionYear = "2017" description = "EmojiCompat Widgets for AppCompat integration" -} \ No newline at end of file +}
diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle index 75b4bb0..e32ae51 100644 --- a/emoji/bundled/build.gradle +++ b/emoji/bundled/build.gradle
@@ -8,7 +8,7 @@ } ext { - fontDir = project(':noto-emoji-compat').projectDir + fontDir = project(":noto-emoji-compat").projectDir } android { @@ -38,4 +38,4 @@ name = "Unicode, Inc. License" url = "http://www.unicode.org/copyright.html#License" } -} \ No newline at end of file +}
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle index 2527905..d412212 100644 --- a/emoji/core/build.gradle +++ b/emoji/core/build.gradle
@@ -12,7 +12,7 @@ } ext { - fontDir = project(':noto-emoji-compat').projectDir + fontDir = project(":noto-emoji-compat").projectDir } BundleInsideHelper.forInsideAar( @@ -34,15 +34,15 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) } android { sourceSets { main { // We use a non-standard manifest path. - manifest.srcFile 'AndroidManifest.xml' - res.srcDirs += 'src/main/res-public' + manifest.srcFile "AndroidManifest.xml" + res.srcDirs += "src/main/res-public" resources { srcDirs += [fontDir.getAbsolutePath()] includes += ["LICENSE_UNICODE", "LICENSE_OFL"]
diff --git a/fakeannotations/build.gradle b/fakeannotations/build.gradle index 3302c21..a8ac931 100644 --- a/fakeannotations/build.gradle +++ b/fakeannotations/build.gradle
@@ -14,10 +14,10 @@ * limitations under the License. */ -apply plugin: 'java-library' +apply plugin: "java-library" dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation(fileTree(dir: "libs", include: ["*.jar"])) } sourceCompatibility = "7"
diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle index 62c92fb..fd891e4 100644 --- a/fragment/fragment-ktx/build.gradle +++ b/fragment/fragment-ktx/build.gradle
@@ -28,13 +28,13 @@ dependencies { api(project(":fragment:fragment")) api("androidx.activity:activity-ktx:1.2.0") { - because 'Mirror fragment dependency graph for -ktx artifacts' + because "Mirror fragment dependency graph for -ktx artifacts" } api("androidx.core:core-ktx:1.1.0") { - because 'Mirror fragment dependency graph for -ktx artifacts' + because "Mirror fragment dependency graph for -ktx artifacts" } api("androidx.collection:collection-ktx:1.1.0") { - because 'Mirror fragment dependency graph for -ktx artifacts' + because "Mirror fragment dependency graph for -ktx artifacts" } api("androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.0") { because 'Mirror fragment dependency graph for -ktx artifacts' @@ -50,9 +50,9 @@ androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.fragment', module: 'fragment' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.fragment", module: "fragment" + }) } androidx {
diff --git a/fragment/fragment-lint/build.gradle b/fragment/fragment-lint/build.gradle index fc8eff6..f7af985 100644 --- a/fragment/fragment-lint/build.gradle +++ b/fragment/fragment-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/fragment/fragment-testing-lint/build.gradle b/fragment/fragment-testing-lint/build.gradle index 4589718..bc6c1f3 100644 --- a/fragment/fragment-testing-lint/build.gradle +++ b/fragment/fragment-testing-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle index 40ec1b2..716c481 100644 --- a/fragment/fragment-testing/build.gradle +++ b/fragment/fragment-testing/build.gradle
@@ -39,7 +39,7 @@ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - lintPublish(project(':fragment:fragment-testing-lint')) + lintPublish(project(":fragment:fragment-testing-lint")) } androidx {
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle index 6b9976c..85ab2fd 100644 --- a/fragment/fragment/build.gradle +++ b/fragment/fragment/build.gradle
@@ -27,7 +27,7 @@ } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -45,8 +45,8 @@ api("androidx.annotation:annotation-experimental:1.0.0") androidTestImplementation("androidx.appcompat:appcompat:1.1.0", { - exclude group: 'androidx.fragment', module: 'fragment' - exclude group: 'androidx.activity', module: 'activity' + exclude group: "androidx.fragment", module: "fragment" + exclude group: "androidx.activity", module: "activity" }) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) @@ -57,9 +57,9 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.fragment', module: 'fragment' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.fragment", module: "fragment" + }) testImplementation(project(":fragment:fragment")) testImplementation(KOTLIN_STDLIB) @@ -69,7 +69,7 @@ testImplementation(TRUTH) testImplementation(ROBOLECTRIC) - lintPublish(project(':fragment:fragment-lint')) + lintPublish(project(":fragment:fragment-lint")) } androidx {
diff --git a/fragment/integration-tests/testapp/build.gradle b/fragment/integration-tests/testapp/build.gradle index f87c5b6..9220e1f 100644 --- a/fragment/integration-tests/testapp/build.gradle +++ b/fragment/integration-tests/testapp/build.gradle
@@ -25,9 +25,9 @@ android { sourceSets { main { - res.srcDirs = ['src/main/res', - 'src/main/res/layouts/doubleTransitionBug', - 'src/main/res/layouts/kittenFragmentTransitions' + res.srcDirs = ["src/main/res", + "src/main/res/layouts/doubleTransitionBug", + "src/main/res/layouts/kittenFragmentTransitions" ] } } @@ -36,8 +36,8 @@ dependencies { implementation(KOTLIN_STDLIB) implementation(project(":fragment:fragment-ktx")) - implementation 'androidx.transition:transition:1.3.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation("androidx.transition:transition:1.3.0") + implementation("androidx.recyclerview:recyclerview:1.1.0") } -tasks['check'].dependsOn(tasks['connectedCheck']) +tasks["check"].dependsOn(tasks["connectedCheck"])
diff --git a/hilt/hilt-compiler/build.gradle b/hilt/hilt-compiler/build.gradle index e9a6b77..c8282c5 100644 --- a/hilt/hilt-compiler/build.gradle +++ b/hilt/hilt-compiler/build.gradle
@@ -42,15 +42,15 @@ testImplementation(TRUTH) testImplementation(GOOGLE_COMPILE_TESTING) testImplementation(HILT_ANDROID) - testImplementation fileTree( + testImplementation(fileTree( dir: "${new File(project(":hilt:hilt-lifecycle-viewmodel").buildDir, "libJar")}", - include : "*.jar") - testImplementation fileTree( + include : "*.jar")) + testImplementation(fileTree( dir: "${new File(project(":hilt:hilt-work").buildDir, "libJar")}", - include : "*.jar") - testImplementation fileTree( + include : "*.jar")) + testImplementation(fileTree( dir: "${SdkHelperKt.getSdkPath(project)}/platforms/$SupportConfig.COMPILE_SDK_VERSION/", - include : "android.jar") + include : "android.jar")) } tasks.named("compileKotlin").configure {
diff --git a/hilt/hilt-lifecycle-viewmodel/build.gradle b/hilt/hilt-lifecycle-viewmodel/build.gradle index 7693f3f..8b9c9262 100644 --- a/hilt/hilt-lifecycle-viewmodel/build.gradle +++ b/hilt/hilt-lifecycle-viewmodel/build.gradle
@@ -28,7 +28,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -47,9 +47,9 @@ // Create jar<variant> task for testImplementation in hilt-compiler. project.tasks.register("jar${suffix}", Jar).configure { - dependsOn variant.javaCompileProvider - from variant.javaCompileProvider.map { task -> task.destinationDir} - destinationDir new File(project.buildDir, "libJar") + dependsOn(variant.javaCompileProvider) + from(variant.javaCompileProvider.map { task -> task.destinationDir}) + destinationDir(new File(project.buildDir, "libJar")) } }
diff --git a/hilt/hilt-work/build.gradle b/hilt/hilt-work/build.gradle index 0b595d7..8186e90 100644 --- a/hilt/hilt-work/build.gradle +++ b/hilt/hilt-work/build.gradle
@@ -28,7 +28,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -46,9 +46,9 @@ // Create jar<variant> task for testImplementation in hilt-compiler. project.tasks.register("jar${suffix}", Jar).configure { - dependsOn variant.javaCompileProvider - from variant.javaCompileProvider.map { task -> task.destinationDir} - destinationDir new File(project.buildDir, "libJar") + dependsOn(variant.javaCompileProvider) + from(variant.javaCompileProvider.map { task -> task.destinationDir}) + destinationDir(new File(project.buildDir, "libJar")) } }
diff --git a/hilt/integration-tests/viewmodelapp/build.gradle b/hilt/integration-tests/viewmodelapp/build.gradle index 3c7861c..b0fbe6d 100644 --- a/hilt/integration-tests/viewmodelapp/build.gradle +++ b/hilt/integration-tests/viewmodelapp/build.gradle
@@ -51,4 +51,4 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(HILT_ANDROID_TESTING) kaptAndroidTest(HILT_COMPILER) -} \ No newline at end of file +}
diff --git a/hilt/integration-tests/workerapp/build.gradle b/hilt/integration-tests/workerapp/build.gradle index a492f84b..1218a73 100644 --- a/hilt/integration-tests/workerapp/build.gradle +++ b/hilt/integration-tests/workerapp/build.gradle
@@ -41,7 +41,7 @@ dependencies { implementation("androidx.activity:activity:1.2.0") - implementation project(":work:work-runtime-ktx") + implementation(project(":work:work-runtime-ktx")) implementation(project(":hilt:hilt-work")) kapt(project(":hilt:hilt-compiler")) implementation(KOTLIN_STDLIB) @@ -55,4 +55,4 @@ androidTestImplementation(project(":work:work-testing")) androidTestImplementation(HILT_ANDROID_TESTING) kaptAndroidTest(HILT_COMPILER) -} \ No newline at end of file +}
diff --git a/include-composite-deps.gradle b/include-composite-deps.gradle index 2ad98d0..ba7bcf1 100644 --- a/include-composite-deps.gradle +++ b/include-composite-deps.gradle
@@ -25,9 +25,9 @@ // be applied to several builds and will only enable itself when part of the root build. if (currentBuildIsRootBuild) { String buildScriptDir = buildscript.sourceFile.parent - File externalRoot = new File(buildScriptDir, '../../external') + File externalRoot = new File(buildScriptDir, "../../external") - includeBuild(new File(externalRoot, 'doclava')) + includeBuild(new File(externalRoot, "doclava")) }
diff --git a/include-support-library.gradle b/include-support-library.gradle index fec8041..4dec3f2f 100644 --- a/include-support-library.gradle +++ b/include-support-library.gradle
@@ -22,12 +22,12 @@ // settings.gradle . For example, if Support Library is at the file path ~/support-library, then // to include Support Library in your build, add this line to the bottom of your settings.gradle: // -// apply(from:'~/support-library/frameworks/support/include-support-library.gradle') +// apply(from:"~/support-library/frameworks/support/include-support-library.gradle") String buildScriptDir = buildscript.sourceFile.parent // include any builds required by Support Library -apply(from:new File(buildScriptDir, 'include-composite-deps.gradle')) +apply(from:new File(buildScriptDir, "include-composite-deps.gradle")) // include Support Library itself includeBuild(buildScriptDir)
diff --git a/inspection/inspection-gradle-plugin/build.gradle b/inspection/inspection-gradle-plugin/build.gradle index b09f862..20e9873 100644 --- a/inspection/inspection-gradle-plugin/build.gradle +++ b/inspection/inspection-gradle-plugin/build.gradle
@@ -31,15 +31,15 @@ apply from: "../../buildSrc/kotlin-dsl-dependency.gradle" dependencies { - implementation findGradleKotlinDsl() - implementation gradleApi() + implementation(findGradleKotlinDsl()) + implementation(gradleApi()) implementation(AGP_STABLE) implementation(KOTLIN_STDLIB) implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.13") implementation("com.github.jengelman.gradle.plugins:shadow:5.2.0") testImplementation(project(":internal-testutils-gradle-plugin")) - testImplementation gradleTestKit() + testImplementation(gradleTestKit()) testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) testImplementation(KOTLIN_TEST)
diff --git a/ipc/ipc-runtime/build.gradle b/ipc/ipc-runtime/build.gradle index 3f3bb3a..5c5d73c 100644 --- a/ipc/ipc-runtime/build.gradle +++ b/ipc/ipc-runtime/build.gradle
@@ -50,4 +50,4 @@ mavenGroup = LibraryGroups.IPC inceptionYear = "2020" description = "Runtime for AndroidX Inter Process Communication Tools" -} \ No newline at end of file +}
diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle index 81faf4c..5214770 100644 --- a/leanback/leanback-preference/build.gradle +++ b/leanback/leanback-preference/build.gradle
@@ -23,7 +23,7 @@ sourceSets { main.java.srcDirs += [ - 'api21' + "api21" ] } }
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle index 4481a37..8bad67a 100644 --- a/leanback/leanback-tab/build.gradle +++ b/leanback/leanback-tab/build.gradle
@@ -18,8 +18,8 @@ dependencies { api("androidx.annotation:annotation:1.1.0") - api('com.google.android.material:material:1.0.0') - api('androidx.viewpager:viewpager:1.0.0') + api("com.google.android.material:material:1.0.0") + api("androidx.viewpager:viewpager:1.0.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) @@ -32,7 +32,7 @@ androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-common")) androidTestImplementation(project(":leanback:leanback")) - androidTestImplementation('androidx.appcompat:appcompat:1.0.0') + androidTestImplementation("androidx.appcompat:appcompat:1.0.0") androidTestImplementation(CONSTRAINT_LAYOUT, { transitive = true }) }
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle index 3cbeb52..25216be 100644 --- a/leanback/leanback/build.gradle +++ b/leanback/leanback/build.gradle
@@ -38,9 +38,9 @@ sourceSets { main.java.srcDirs += [ - 'common', - 'kitkat', - 'api21', + "common", + "kitkat", + "api21", ] } }
diff --git a/lifecycle/integration-tests/incrementality/build.gradle b/lifecycle/integration-tests/incrementality/build.gradle index 1168dd5..e802401 100644 --- a/lifecycle/integration-tests/incrementality/build.gradle +++ b/lifecycle/integration-tests/incrementality/build.gradle
@@ -27,7 +27,7 @@ implementation(KOTLIN_STDLIB) testImplementation(JUNIT) testImplementation(TRUTH) - testImplementation gradleTestKit() + testImplementation(gradleTestKit()) } SdkResourceGenerator.generateForHostTest(project)
diff --git a/lifecycle/integration-tests/kotlintestapp/build.gradle b/lifecycle/integration-tests/kotlintestapp/build.gradle index 81fb918..7033177 100644 --- a/lifecycle/integration-tests/kotlintestapp/build.gradle +++ b/lifecycle/integration-tests/kotlintestapp/build.gradle
@@ -29,7 +29,7 @@ dependencies { implementation(project(":lifecycle:lifecycle-runtime-ktx")) implementation("androidx.activity:activity:1.2.0") { - exclude group: 'androidx.lifecycle' + exclude group: "androidx.lifecycle" } implementation(project(":lifecycle:lifecycle-viewmodel-savedstate")) { because "Used by :activity:activity" @@ -52,12 +52,12 @@ android { kotlinOptions { - // Allow usage of Kotlin's @OptIn. + // Allow usage of Kotlin"s @OptIn. freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] - jvmTarget = '1.8' // necessary to use espresso kotlin extensions + jvmTarget = "1.8" // necessary to use espresso kotlin extensions } sourceSets { - test.java.srcDirs += 'src/test-common/java' - androidTest.java.srcDirs += 'src/test-common/java' + test.java.srcDirs += "src/test-common/java" + androidTest.java.srcDirs += "src/test-common/java" } }
diff --git a/lifecycle/lifecycle-compiler/build.gradle b/lifecycle/lifecycle-compiler/build.gradle index 1c862f4..cde5b80 100644 --- a/lifecycle/lifecycle-compiler/build.gradle +++ b/lifecycle/lifecycle-compiler/build.gradle
@@ -48,7 +48,7 @@ dependsOn(compileJava) source "src/test/test-data/lib/src" classpath = project.compileJava.classpath - destinationDir = new File(project.buildDir, 'test-data/lib/classes') + destinationDir = new File(project.buildDir, "test-data/lib/classes") } tasks.register("jarTestLibrarySource", Jar).configure {
diff --git a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle index 24901c8..0c773e9 100644 --- a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle +++ b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
@@ -29,17 +29,17 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST - compileOnly LINT_CORE + compileOnly(LINT_API_LATEST) + compileOnly(LINT_CORE) } else { - compileOnly LINT_API_MIN - compileOnly "com.android.tools.lint:lint:$lintMinVersion" + compileOnly(LINT_API_MIN) + compileOnly("com.android.tools.lint:lint:$lintMinVersion") } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle index 6e0183f..040abc1 100644 --- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle +++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
@@ -38,7 +38,7 @@ testImplementation(JUNIT) testImplementation(TRUTH) - lintPublish(project(':lifecycle:lifecycle-livedata-core-ktx-lint')) + lintPublish(project(":lifecycle:lifecycle-livedata-core-ktx-lint")) } androidx {
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle index bafedb5..ecbb0d5 100644 --- a/lifecycle/lifecycle-process/build.gradle +++ b/lifecycle/lifecycle-process/build.gradle
@@ -27,7 +27,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle index 605e5ea..7fb8461 100644 --- a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle +++ b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
@@ -29,15 +29,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/lifecycle/lifecycle-runtime-ktx/build.gradle b/lifecycle/lifecycle-runtime-ktx/build.gradle index 085a95d..f638906 100644 --- a/lifecycle/lifecycle-runtime-ktx/build.gradle +++ b/lifecycle/lifecycle-runtime-ktx/build.gradle
@@ -37,14 +37,14 @@ testImplementation(JUNIT) testImplementation(TRUTH) - androidTestImplementation project(':lifecycle:lifecycle-runtime') + androidTestImplementation(project(":lifecycle:lifecycle-runtime")) androidTestImplementation(TRUTH) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(KOTLIN_COROUTINES_TEST) - lintPublish(project(':lifecycle:lifecycle-runtime-ktx-lint')) + lintPublish(project(":lifecycle:lifecycle-runtime-ktx-lint")) } androidx {
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle index ae764d9..3ee8d69 100644 --- a/lifecycle/lifecycle-runtime/build.gradle +++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -15,7 +15,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -36,10 +36,10 @@ } androidx { - name 'Android Lifecycle Runtime' + name "Android Lifecycle Runtime" publish = Publish.SNAPSHOT_AND_RELEASE mavenVersion = LibraryVersions.LIFECYCLE mavenGroup LibraryGroups.LIFECYCLE - inceptionYear '2017' + inceptionYear "2017" description "Android Lifecycle Runtime" }
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle index a5a305b..b6496aa 100644 --- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle +++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -28,7 +28,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles("proguard-rules.pro") } } @@ -41,16 +41,16 @@ androidTestImplementation projectOrArtifact(":lifecycle:lifecycle-runtime") androidTestImplementation projectOrArtifact(":lifecycle:lifecycle-livedata-core") androidTestImplementation ("androidx.fragment:fragment:1.3.0") { - exclude group: 'androidx.lifecycle', module: 'lifecycle-runtime' - exclude group: 'androidx.lifecycle', module: 'lifecycle-livedata-core' - exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-savedstate' - exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel' + exclude group: "androidx.lifecycle", module: "lifecycle-runtime" + exclude group: "androidx.lifecycle", module: "lifecycle-livedata-core" + exclude group: "androidx.lifecycle", module: "lifecycle-viewmodel-savedstate" + exclude group: "androidx.lifecycle", module: "lifecycle-viewmodel" } androidTestImplementation project(":internal-testutils-runtime"), { - exclude group: 'androidx.lifecycle', module: 'lifecycle-runtime' - exclude group: 'androidx.lifecycle', module: 'lifecycle-livedata-core' - exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-savedstate' - exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel' + exclude group: "androidx.lifecycle", module: "lifecycle-runtime" + exclude group: "androidx.lifecycle", module: "lifecycle-livedata-core" + exclude group: "androidx.lifecycle", module: "lifecycle-viewmodel-savedstate" + exclude group: "androidx.lifecycle", module: "lifecycle-viewmodel" } androidTestImplementation(TRUTH) androidTestImplementation(KOTLIN_STDLIB)
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle index f839939..d91105d 100644 --- a/lifecycle/lifecycle-viewmodel/build.gradle +++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -32,7 +32,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/lint-checks/build.gradle b/lint-checks/build.gradle index 2ef2502..470f379 100644 --- a/lint-checks/build.gradle +++ b/lint-checks/build.gradle
@@ -24,13 +24,13 @@ } dependencies { - compileOnly LINT_API_LATEST - compileOnly LINT_CHECKS_LATEST - compileOnly KOTLIN_STDLIB + compileOnly(LINT_API_LATEST) + compileOnly(LINT_CHECKS_LATEST) + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/lint-checks/tests/build.gradle b/lint-checks/tests/build.gradle index 73df2d4..3677028 100644 --- a/lint-checks/tests/build.gradle +++ b/lint-checks/tests/build.gradle
@@ -27,10 +27,10 @@ } dependencies { - testImplementation LINT_CORE - testImplementation LINT_API_LATEST - testImplementation KOTLIN_STDLIB - testImplementation LINT_TESTS + testImplementation(LINT_CORE) + testImplementation(LINT_API_LATEST) + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_TESTS) testImplementation("androidx.annotation:annotation:1.0.0") - testImplementation project(":lint-checks") + testImplementation(project(":lint-checks")) }
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle index 90a837c..e27fe01 100644 --- a/loader/loader-ktx/build.gradle +++ b/loader/loader-ktx/build.gradle
@@ -28,7 +28,7 @@ dependencies { api(project(":loader:loader")) api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0") { - because 'Mirror loader dependency graph for -ktx artifacts' + because "Mirror loader dependency graph for -ktx artifacts" } api(KOTLIN_STDLIB)
diff --git a/media/media/build.gradle b/media/media/build.gradle index 59aa4f4..49e34a9 100644 --- a/media/media/build.gradle +++ b/media/media/build.gradle
@@ -32,7 +32,7 @@ androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) annotationProcessor(project(":versionedparcelable:versionedparcelable-compiler")) } @@ -43,11 +43,11 @@ sourceSets { main.java.srcDirs += [ ] - main.res.srcDirs += 'src/main/res-public' + main.res.srcDirs += "src/main/res-public" } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/media/version-compat-tests/previous/client/build.gradle b/media/version-compat-tests/previous/client/build.gradle index f32aaa4..fb07973 100644 --- a/media/version-compat-tests/previous/client/build.gradle +++ b/media/version-compat-tests/previous/client/build.gradle
@@ -22,8 +22,8 @@ } dependencies { - androidTestImplementation project(':media:version-compat-tests:lib') - androidTestImplementation "com.android.support:support-media-compat:27.1.0" + androidTestImplementation(project(":media:version-compat-tests:lib")) + androidTestImplementation("com.android.support:support-media-compat:27.1.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/media/version-compat-tests/previous/service/build.gradle b/media/version-compat-tests/previous/service/build.gradle index 9edfd60..fb07973 100644 --- a/media/version-compat-tests/previous/service/build.gradle +++ b/media/version-compat-tests/previous/service/build.gradle
@@ -23,7 +23,7 @@ dependencies { androidTestImplementation(project(":media:version-compat-tests:lib")) - androidTestImplementation "com.android.support:support-media-compat:27.1.0" + androidTestImplementation("com.android.support:support-media-compat:27.1.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/media2/integration-tests/testapp/build.gradle b/media2/integration-tests/testapp/build.gradle index ffefd37..9291b51 100644 --- a/media2/integration-tests/testapp/build.gradle +++ b/media2/integration-tests/testapp/build.gradle
@@ -18,7 +18,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -37,4 +37,4 @@ defaultConfig { minSdkVersion 19 } -} \ No newline at end of file +}
diff --git a/media2/media2-common/build.gradle b/media2/media2-common/build.gradle index 4a969ee..45d8b15 100644 --- a/media2/media2-common/build.gradle +++ b/media2/media2-common/build.gradle
@@ -39,7 +39,7 @@ androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) annotationProcessor(project(":versionedparcelable:versionedparcelable-compiler")) } @@ -51,7 +51,7 @@ aidl = true } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/media2/media2-exoplayer/build.gradle b/media2/media2-exoplayer/build.gradle index 3f9c666..8630348 100644 --- a/media2/media2-exoplayer/build.gradle +++ b/media2/media2-exoplayer/build.gradle
@@ -31,7 +31,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/media2/media2-player/build.gradle b/media2/media2-player/build.gradle index 24bf0ce..73f080a 100644 --- a/media2/media2-player/build.gradle +++ b/media2/media2-player/build.gradle
@@ -40,7 +40,7 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) annotationProcessor(project(":versionedparcelable:versionedparcelable-compiler")) }
diff --git a/media2/media2-session/build.gradle b/media2/media2-session/build.gradle index 0b28cba..4aa0edb 100644 --- a/media2/media2-session/build.gradle +++ b/media2/media2-session/build.gradle
@@ -38,7 +38,7 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) annotationProcessor(project(":versionedparcelable:versionedparcelable-compiler")) }
diff --git a/media2/media2-session/version-compat-tests/current/client/build.gradle b/media2/media2-session/version-compat-tests/current/client/build.gradle index 4dbf70c..4aba0c2 100644 --- a/media2/media2-session/version-compat-tests/current/client/build.gradle +++ b/media2/media2-session/version-compat-tests/current/client/build.gradle
@@ -39,4 +39,4 @@ androidx { failOnDeprecationWarnings = false -} \ No newline at end of file +}
diff --git a/media2/media2-session/version-compat-tests/current/service/build.gradle b/media2/media2-session/version-compat-tests/current/service/build.gradle index 8dabfb8..8581bf7 100644 --- a/media2/media2-session/version-compat-tests/current/service/build.gradle +++ b/media2/media2-session/version-compat-tests/current/service/build.gradle
@@ -38,4 +38,4 @@ androidx { failOnDeprecationWarnings = false -} \ No newline at end of file +}
diff --git a/media2/media2-session/version-compat-tests/previous/client/build.gradle b/media2/media2-session/version-compat-tests/previous/client/build.gradle index ae04edb8..6ad9276 100644 --- a/media2/media2-session/version-compat-tests/previous/client/build.gradle +++ b/media2/media2-session/version-compat-tests/previous/client/build.gradle
@@ -39,4 +39,4 @@ androidx { failOnDeprecationWarnings = false -} \ No newline at end of file +}
diff --git a/media2/media2-session/version-compat-tests/previous/service/build.gradle b/media2/media2-session/version-compat-tests/previous/service/build.gradle index 0a1091e..e97dd1a 100644 --- a/media2/media2-session/version-compat-tests/previous/service/build.gradle +++ b/media2/media2-session/version-compat-tests/previous/service/build.gradle
@@ -38,4 +38,4 @@ androidx { failOnDeprecationWarnings = false -} \ No newline at end of file +}
diff --git a/media2/media2-widget/build.gradle b/media2/media2-widget/build.gradle index 01329f2..f26fb57 100644 --- a/media2/media2-widget/build.gradle +++ b/media2/media2-widget/build.gradle
@@ -36,8 +36,8 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(':internal-testutils-runtime') - androidTestImplementation project(':media2:media2-player') + androidTestImplementation(project(":internal-testutils-runtime")) + androidTestImplementation(project(":media2:media2-player")) } android { @@ -45,7 +45,7 @@ minSdkVersion 16 } sourceSets { - main.res.srcDirs += 'src/main/res-public' + main.res.srcDirs += "src/main/res-public" } lintOptions { // Lint cannot determine the groupId of androidx.media2:media2widget,
diff --git a/mediarouter/mediarouter/build.gradle b/mediarouter/mediarouter/build.gradle index 1b27ddf..0afec28 100644 --- a/mediarouter/mediarouter/build.gradle +++ b/mediarouter/mediarouter/build.gradle
@@ -37,21 +37,21 @@ androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) - androidTestImplementation project(':media:version-compat-tests:lib') + androidTestImplementation(project(":media:version-compat-tests:lib")) } android { sourceSets { main.java.srcDirs += [ - 'jellybean', - 'jellybean-mr1', - 'jellybean-mr2', - 'api24' + "jellybean", + "jellybean-mr1", + "jellybean-mr2", + "api24" ] } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/mppsample/mppsample-executable/build.gradle b/mppsample/mppsample-executable/build.gradle index 68d3ac17..ce5abc6 100644 --- a/mppsample/mppsample-executable/build.gradle +++ b/mppsample/mppsample-executable/build.gradle
@@ -17,7 +17,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { - id('kotlin-multiplatform') + id("kotlin-multiplatform") } kotlin {
diff --git a/mppsample/mppsample-library/build.gradle b/mppsample/mppsample-library/build.gradle index 33edc12..398c66f 100644 --- a/mppsample/mppsample-library/build.gradle +++ b/mppsample/mppsample-library/build.gradle
@@ -19,7 +19,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { - id('kotlin-multiplatform') + id("kotlin-multiplatform") id("AndroidXPlugin") id("com.android.library") } @@ -31,7 +31,7 @@ android() js() jvm() - fromPreset(presets.linuxX64, 'linux') + fromPreset(presets.linuxX64, "linux") } // We specify additional dependencies for the presets above in the sourceSets block. sourceSets { @@ -39,48 +39,48 @@ // included (implicit "dependsOn") in all sourcesets in the Kotlin MPP presets. commonMain { dependencies { - implementation KOTLIN_STDLIB_COMMON + implementation(KOTLIN_STDLIB_COMMON) } } commonTest { dependencies { - implementation KOTLIN_TEST_COMMON - implementation KOTLIN_TEST_ANNOTATIONS_COMMON + implementation(KOTLIN_TEST_COMMON) + implementation(KOTLIN_TEST_ANNOTATIONS_COMMON) } } // Note that although we don't have androidXYZ/ directories, Android targets are still // generated from the commonMain/commonTest/jvmMain/jvmTest, given the android() preset. androidMain { - dependsOn jvmMain + dependsOn(jvmMain) } // TODO: Android test names will change after https://youtrack.jetbrains.com/issue/KT-34650 androidTest { - dependsOn jvmTest + dependsOn(jvmTest) } androidAndroidTest { - dependsOn jvmTest + dependsOn(jvmTest) } jvmMain { dependencies { - implementation KOTLIN_STDLIB_JDK8 + implementation(KOTLIN_STDLIB_JDK8) } } // jvmTest differs from androidTest in that it fails at compile-time if any android // dependencies are included, whereas androidTest fails at runtime only if they are used. jvmTest { dependencies { - implementation KOTLIN_TEST - implementation KOTLIN_TEST_JUNIT + implementation(KOTLIN_TEST) + implementation(KOTLIN_TEST_JUNIT) } } jsMain { dependencies { - implementation KOTLIN_STDLIB_JS + implementation(KOTLIN_STDLIB_JS) } } jsTest { dependencies { - implementation KOTLIN_TEST_JS + implementation(KOTLIN_TEST_JS) } } }
diff --git a/navigation/integration-tests/safeargs-testapp/build.gradle b/navigation/integration-tests/safeargs-testapp/build.gradle index 19182c7..ac8cc33 100644 --- a/navigation/integration-tests/safeargs-testapp/build.gradle +++ b/navigation/integration-tests/safeargs-testapp/build.gradle
@@ -28,7 +28,7 @@ repositories { maven { - url "$buildDir/localMaven/" + url("$buildDir/localMaven/") } } dependencies { @@ -42,12 +42,12 @@ id("com.android.application") } -apply plugin: 'androidx.navigation.safeargs' +apply plugin: "androidx.navigation.safeargs" apply from: "${supportRootFolder}/buildSrc/repos.gradle" repos.addMavenRepositories(repositories) repositories { maven { - url "$buildDir/localMaven/" + url("$buildDir/localMaven/") } } @@ -68,4 +68,4 @@ implementation "${LibraryGroups.NAVIGATION}:navigation-runtime:${LibraryVersions.NAVIGATION}" testImplementation(JUNIT) testImplementation(MOCKITO_CORE) -} \ No newline at end of file +}
diff --git a/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle b/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle index 06c6e9e..f2f9b2f 100644 --- a/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle +++ b/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle
@@ -19,12 +19,12 @@ repos.addMavenRepositories(repositories) ext.runningInBuildServer = System.env.DIST_DIR != null && System.env.OUT_DIR != null -ext.repoDir = runningInBuildServer ? new File(System.env.OUT_DIR + '/gradle/frameworks/support/build') : +ext.repoDir = runningInBuildServer ? new File(System.env.OUT_DIR + "/gradle/frameworks/support/build") : new File("$supportRootFolder/../../out/frameworks/support/build") task createArchive(type: Exec) { inputs.files(fileTree(dir: "$supportRootFolder/navigation", - includes: ['**/*.java', '**/*.kt'], exclude: 'integration-tests/*')) + includes: ["**/*.java", "**/*.kt"], exclude: "integration-tests/*")) outputs.dir(repoDir) workingDir supportRootFolder commandLine "./gradlew", "createArchive" @@ -35,7 +35,7 @@ into "../build/localMaven/" } -apply plugin: 'java' +apply plugin: "java" dependencies { compile project(":moar-buildSrc") }
diff --git a/navigation/integration-tests/safeargs-testapp/buildSrc/settings.gradle b/navigation/integration-tests/safeargs-testapp/buildSrc/settings.gradle index ae61ad6..d7dcc24 100644 --- a/navigation/integration-tests/safeargs-testapp/buildSrc/settings.gradle +++ b/navigation/integration-tests/safeargs-testapp/buildSrc/settings.gradle
@@ -1,2 +1,2 @@ -include ':moar-buildSrc' -project(':moar-buildSrc').projectDir = new File(rootDir, "../../../../buildSrc/") \ No newline at end of file +include ":moar-buildSrc" +project(":moar-buildSrc").projectDir = new File(rootDir, "../../../../buildSrc/") \ No newline at end of file
diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle index 046b096..6b61494 100644 --- a/navigation/integration-tests/testapp/build.gradle +++ b/navigation/integration-tests/testapp/build.gradle
@@ -20,7 +20,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -35,8 +35,8 @@ implementation(project(":navigation:navigation-fragment-ktx")) implementation(project(":navigation:navigation-ui-ktx")) implementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) } -tasks['check'].dependsOn(tasks['connectedCheck']) +tasks["check"].dependsOn(tasks["connectedCheck"])
diff --git a/navigation/navigation-common-ktx/build.gradle b/navigation/navigation-common-ktx/build.gradle index 69b4d3e..d9eb50a 100644 --- a/navigation/navigation-common-ktx/build.gradle +++ b/navigation/navigation-common-ktx/build.gradle
@@ -27,7 +27,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle index 22a2bc5..a38589f 100644 --- a/navigation/navigation-common/build.gradle +++ b/navigation/navigation-common/build.gradle
@@ -52,11 +52,11 @@ def name = variant.name def suffix = name.capitalize() project.tasks.register("jar${suffix}", Copy).configure { - dependsOn ("assemble$suffix") + dependsOn("assemble$suffix") from(zipTree("${project.buildDir}/outputs/aar/navigation-common-${name}.aar")) { - include "classes.jar" + include("classes.jar") } - destinationDir new File(project.buildDir, "libJar") + destinationDir(new File(project.buildDir, "libJar")) } }
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 9b2b8e3..7054f26 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle
@@ -29,22 +29,22 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api projectOrArtifact(":activity:activity-compose") - api projectOrArtifact(":compose:runtime:runtime") - api projectOrArtifact(":compose:runtime:runtime-saveable") - api projectOrArtifact(":compose:ui:ui") - api projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose") - api "androidx.navigation:navigation-runtime-ktx:2.3.1" + api(projectOrArtifact(":activity:activity-compose")) + api(projectOrArtifact(":compose:runtime:runtime")) + api(projectOrArtifact(":compose:runtime:runtime-saveable")) + api(projectOrArtifact(":compose:ui:ui")) + api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose")) + api("androidx.navigation:navigation-runtime-ktx:2.3.1") - androidTestImplementation projectOrArtifact(":compose:material:material") - androidTestImplementation 'androidx.navigation:navigation-testing:2.3.1' - androidTestImplementation projectOrArtifact(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' - } - androidTestImplementation projectOrArtifact(":compose:ui:ui-test-junit4") + androidTestImplementation(projectOrArtifact(":compose:material:material")) + androidTestImplementation("androidx.navigation:navigation-testing:2.3.1") + androidTestImplementation(projectOrArtifact(":internal-testutils-navigation"), { + exclude group: "androidx.navigation", module: "navigation-common-ktx" + }) + androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle index 7ba0cb8..cf1461d 100644 --- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle +++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
@@ -27,14 +27,14 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation projectOrArtifact(":compose:integration-tests:demos:common") - implementation projectOrArtifact(":compose:foundation:foundation") - implementation projectOrArtifact(":compose:material:material") - implementation projectOrArtifact(":navigation:navigation-compose") - implementation projectOrArtifact(":navigation:navigation-compose:navigation-compose-samples") + implementation(projectOrArtifact(":compose:integration-tests:demos:common")) + implementation(projectOrArtifact(":compose:foundation:foundation")) + implementation(projectOrArtifact(":compose:material:material")) + implementation(projectOrArtifact(":navigation:navigation-compose")) + implementation(projectOrArtifact(":navigation:navigation-compose:navigation-compose-samples")) } androidx {
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle index 7da2e2b..a96826d 100644 --- a/navigation/navigation-compose/samples/build.gradle +++ b/navigation/navigation-compose/samples/build.gradle
@@ -29,13 +29,13 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly projectOrArtifact(":annotation:annotation-sampled") - implementation projectOrArtifact(":compose:foundation:foundation") - implementation projectOrArtifact(":navigation:navigation-compose") - implementation projectOrArtifact(":compose:material:material") + compileOnly(projectOrArtifact(":annotation:annotation-sampled")) + implementation(projectOrArtifact(":compose:foundation:foundation")) + implementation(projectOrArtifact(":navigation:navigation-compose")) + implementation(projectOrArtifact(":compose:material:material")) } androidx {
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle index ee901fe..818faab52e 100644 --- a/navigation/navigation-dynamic-features-fragment/build.gradle +++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -46,9 +46,9 @@ androidTestImplementation(ESPRESSO_CORE) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) androidTestImplementation(TRUTH) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.fragment', module: 'fragment' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.fragment", module: "fragment" + }) } androidx {
diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle index 67be97f..3a543a0 100644 --- a/navigation/navigation-fragment-ktx/build.gradle +++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -44,7 +44,7 @@ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) androidTestImplementation(project(":internal-testutils-runtime")) androidTestImplementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) }
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle index 98390ed..f19ff7c 100644 --- a/navigation/navigation-fragment/build.gradle +++ b/navigation/navigation-fragment/build.gradle
@@ -36,11 +36,11 @@ androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(TRUTH) androidTestImplementation(KOTLIN_STDLIB) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.fragment', module: 'fragment' - } - androidTestImplementation(project(':internal-testutils-navigation'), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.fragment", module: "fragment" + }) + androidTestImplementation(project(":internal-testutils-navigation"), { + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) }
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle index 074c94f..10ce2b8 100644 --- a/navigation/navigation-runtime-ktx/build.gradle +++ b/navigation/navigation-runtime-ktx/build.gradle
@@ -31,14 +31,14 @@ // Ensure that the -ktx dependency graph mirrors the Java dependency graph api(project(":navigation:navigation-common-ktx")) api("androidx.activity:activity-ktx:1.1.0") { - because 'Mirror navigation-runtime dependency graph for -ktx artifacts' + because "Mirror navigation-runtime dependency graph for -ktx artifacts" } api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0") { - because 'Mirror navigation-runtime dependency graph for -ktx artifacts' + because "Mirror navigation-runtime dependency graph for -ktx artifacts" } api(KOTLIN_STDLIB) androidTestImplementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) androidTestImplementation(TRUTH) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/navigation/navigation-runtime-truth/build.gradle b/navigation/navigation-runtime-truth/build.gradle index e192dcc..f9798fd 100644 --- a/navigation/navigation-runtime-truth/build.gradle +++ b/navigation/navigation-runtime-truth/build.gradle
@@ -34,7 +34,7 @@ api(KOTLIN_STDLIB) androidTestImplementation(project(":internal-testutils-truth")) androidTestImplementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) androidTestImplementation(TRUTH) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/navigation/navigation-safe-args-generator/build.gradle b/navigation/navigation-safe-args-generator/build.gradle index 8d1f492..757d8ed 100644 --- a/navigation/navigation-safe-args-generator/build.gradle +++ b/navigation/navigation-safe-args-generator/build.gradle
@@ -32,22 +32,22 @@ implementation(KOTLIN_STDLIB) implementation(JAVAPOET) - implementation "com.squareup:kotlinpoet:1.7.2" + implementation("com.squareup:kotlinpoet:1.7.2") testImplementation(JUNIT) testImplementation(GOOGLE_COMPILE_TESTING) - testImplementation fileTree( + testImplementation(fileTree( dir: "${SdkHelperKt.getSdkPath(project)}/platforms/$SupportConfig.COMPILE_SDK_VERSION/", include : "android.jar" - ) - testImplementation fileTree( + )) + testImplementation(fileTree( dir: "${new File(project(":navigation:navigation-common").buildDir, "libJar")}", include : "*.jar" - ) - testImplementation fileTree( + )) + testImplementation(fileTree( dir: "${new File(project(":lifecycle:lifecycle-viewmodel-savedstate").buildDir, "libJar")}", include : "*.jar" - ) + )) } tasks.findByName("test").doFirst { @@ -62,9 +62,9 @@ tasks.findByName("compileKotlin").dependsOn(":lifecycle:lifecycle-viewmodel-savedstate:jarDebug") androidx { - name = 'Android Navigation TypeSafe Arguments Generator' + name = "Android Navigation TypeSafe Arguments Generator" type = LibraryType.OTHER_CODE_PROCESSOR mavenGroup = LibraryGroups.NAVIGATION - inceptionYear = '2017' + inceptionYear = "2017" description = "Android Navigation TypeSafe Arguments Generator" }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle index 63f25bb..13a7464 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/build.gradle
@@ -15,8 +15,8 @@ */ plugins { - id('com.android.dynamic-feature') - id('androidx.navigation.safeargs') + id("com.android.dynamic-feature") + id("androidx.navigation.safeargs") } android { @@ -45,7 +45,7 @@ } dependencies { - implementation project(':feature') - implementation project(':base') - implementation "$navigationCommonDep" + implementation(project(":feature")) + implementation(project(":base")) + implementation("$navigationCommonDep") }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle index 2a5b3a0..b9d7c79 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/base/build.gradle
@@ -15,8 +15,8 @@ */ plugins { - id('com.android.application') - id('androidx.navigation.safeargs') + id("com.android.application") + id("androidx.navigation.safeargs") } android { buildToolsVersion buildTools @@ -43,6 +43,6 @@ } dependencies { - implementation project(":library") - implementation "$navigationCommonDep" + implementation(project(":library")) + implementation("$navigationCommonDep") }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle index 1fcbb2b..11de549 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/dynamic_feature/build.gradle
@@ -15,8 +15,8 @@ */ plugins { - id('com.android.dynamic-feature') - id('androidx.navigation.safeargs') + id("com.android.dynamic-feature") + id("androidx.navigation.safeargs") } android { buildToolsVersion buildTools @@ -44,7 +44,7 @@ } dependencies { - implementation project(':base') - implementation project(':app') - implementation "$navigationCommonDep" + implementation(project(":base")) + implementation(project(":app")) + implementation("$navigationCommonDep") }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle index 73b3aa0..4acd09f2 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/feature/build.gradle
@@ -15,8 +15,8 @@ */ plugins { - id('com.android.dynamic-feature') - id('androidx.navigation.safeargs') + id("com.android.dynamic-feature") + id("androidx.navigation.safeargs") } android { @@ -44,6 +44,6 @@ } dependencies { - implementation project(':base') - implementation "$navigationCommonDep" + implementation(project(":base")) + implementation("$navigationCommonDep") }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle index 633b92f..85d230e 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/instantapp/build.gradle
@@ -14,7 +14,7 @@ * limitations under the License. */ -apply plugin: 'com.android.dynamic-feature' +apply plugin: "com.android.dynamic-feature" android { signingConfigs { @@ -36,6 +36,6 @@ } dependencies { - implementation project(':feature') - implementation project(':base') + implementation(project(":feature")) + implementation(project(":base")) }
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle index bc961b2..62f5974 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/library/build.gradle
@@ -15,8 +15,8 @@ */ plugins { - id('com.android.library') - id('androidx.navigation.safeargs') + id("com.android.library") + id("androidx.navigation.safeargs") } android { @@ -43,6 +43,6 @@ } dependencies { - implementation "$navigationCommonDep" + implementation("$navigationCommonDep") } -} \ No newline at end of file +}
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/settings.gradle b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/settings.gradle index ca43ab7..35fd2eb 100644 --- a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/settings.gradle +++ b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/settings.gradle
@@ -14,4 +14,4 @@ * limitations under the License. */ -include ':feature', ':app', ':base',/* ':instantapp', */':library', ':dynamic_feature' +include ":feature", ":app", ":base",/* ":instantapp", */":library", ":dynamic_feature"
diff --git a/navigation/navigation-testing/build.gradle b/navigation/navigation-testing/build.gradle index 9b5ba215..22e4cfa 100644 --- a/navigation/navigation-testing/build.gradle +++ b/navigation/navigation-testing/build.gradle
@@ -31,7 +31,7 @@ api(project(":navigation:navigation-runtime-ktx")) androidTestImplementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) androidTestImplementation(project(":navigation:navigation-fragment-ktx")) androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle index 9450761..f8525004 100644 --- a/navigation/navigation-ui/build.gradle +++ b/navigation/navigation-ui/build.gradle
@@ -28,7 +28,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -36,11 +36,11 @@ api(project(":navigation:navigation-runtime-ktx")) api("androidx.customview:customview:1.1.0") api("androidx.drawerlayout:drawerlayout:1.1.1") - api('com.google.android.material:material:1.0.0') - implementation('androidx.transition:transition:1.3.0') + api("com.google.android.material:material:1.0.0") + implementation("androidx.transition:transition:1.3.0") androidTestImplementation(project(":internal-testutils-navigation"), { - exclude group: 'androidx.navigation', module: 'navigation-common-ktx' + exclude group: "androidx.navigation", module: "navigation-common-ktx" }) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle index fe08421..183eca4 100644 --- a/paging/paging-compose/build.gradle +++ b/paging/paging-compose/build.gradle
@@ -30,14 +30,14 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - api projectOrArtifact(":compose:foundation:foundation") - api projectOrArtifact(":paging:paging-common") + api(projectOrArtifact(":compose:foundation:foundation")) + api(projectOrArtifact(":paging:paging-common")) - androidTestImplementation projectOrArtifact(":compose:ui:ui-test-junit4") - androidTestImplementation projectOrArtifact(':internal-testutils-paging') + androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4")) + androidTestImplementation(projectOrArtifact(":internal-testutils-paging")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH)
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle index f2da6c4..fe7986fb 100644 --- a/paging/paging-compose/integration-tests/paging-demos/build.gradle +++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -28,19 +28,19 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - implementation projectOrArtifact(":compose:integration-tests:demos:common") - implementation projectOrArtifact(":compose:foundation:foundation") - implementation projectOrArtifact(":compose:material:material") - implementation projectOrArtifact(":paging:paging-compose") - implementation projectOrArtifact(":paging:paging-compose:paging-compose-samples") + implementation(projectOrArtifact(":compose:integration-tests:demos:common")) + implementation(projectOrArtifact(":compose:foundation:foundation")) + implementation(projectOrArtifact(":compose:material:material")) + implementation(projectOrArtifact(":paging:paging-compose")) + implementation(projectOrArtifact(":paging:paging-compose:paging-compose-samples")) def room_version = "2.3.0-alpha02" - api "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" - implementation "androidx.room:room-ktx:$room_version" + api("androidx.room:room-runtime:$room_version") + kapt("androidx.room:room-compiler:$room_version") + implementation("androidx.room:room-ktx:$room_version") } androidx {
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle index 6226500..3ae394a 100644 --- a/paging/paging-compose/samples/build.gradle +++ b/paging/paging-compose/samples/build.gradle
@@ -28,13 +28,13 @@ } dependencies { - kotlinPlugin projectOrArtifact(":compose:compiler:compiler") + kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) implementation(KOTLIN_STDLIB) - compileOnly projectOrArtifact(":annotation:annotation-sampled") - implementation projectOrArtifact(":compose:foundation:foundation") - implementation projectOrArtifact(":compose:material:material") - implementation projectOrArtifact(":paging:paging-compose") + compileOnly(projectOrArtifact(":annotation:annotation-sampled")) + implementation(projectOrArtifact(":compose:foundation:foundation")) + implementation(projectOrArtifact(":compose:material:material")) + implementation(projectOrArtifact(":paging:paging-compose")) } androidx {
diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle index 9d48036..ae86a44 100644 --- a/percentlayout/percentlayout/build.gradle +++ b/percentlayout/percentlayout/build.gradle
@@ -21,7 +21,7 @@ android { sourceSets { - main.res.srcDir 'res' + main.res.srcDir "res" } }
diff --git a/placeholder-tests/build.gradle b/placeholder-tests/build.gradle index f0ba3cc..863ce958 100644 --- a/placeholder-tests/build.gradle +++ b/placeholder-tests/build.gradle
@@ -31,4 +31,4 @@ androidx { name = "Dummy Project for test runner" -} \ No newline at end of file +}
diff --git a/playground-common/playground-build.gradle b/playground-common/playground-build.gradle index 6fe540c..3e28fd0 100644 --- a/playground-common/playground-build.gradle +++ b/playground-common/playground-build.gradle
@@ -58,7 +58,7 @@ classpath build_libs.agp classpath build_libs.kotlin.gradle_plugin classpath build_libs.kotlin.ksp_gradle_plugin - classpath 'androidx.build:gradle-plugin:0.1.0' + classpath "androidx.build:gradle-plugin:0.1.0" classpath "com.github.jengelman.gradle.plugins:shadow:5.2.0" } }
diff --git a/playground-common/playground-include-settings.gradle b/playground-common/playground-include-settings.gradle index 4228541..4f2e033 100644 --- a/playground-common/playground-include-settings.gradle +++ b/playground-common/playground-include-settings.gradle
@@ -106,7 +106,7 @@ def jvmVersion = System.getProperty("java.vm.specification.version") if (jvmVersion != "11") { def guidance; - if (startParameter.projectProperties.containsKey('android.injected.invoked.from.ide')) { + if (startParameter.projectProperties.containsKey("android.injected.invoked.from.ide")) { guidance = "Make sure to set the gradle JDK to JDK 11 in the project settings." + "(File -> Other Settings -> Default Project Structure)" } else {
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle index ef64c5c..0f73207 100644 --- a/preference/preference-ktx/build.gradle +++ b/preference/preference-ktx/build.gradle
@@ -37,10 +37,10 @@ dependencies { api(project(":preference:preference")) api("androidx.core:core-ktx:1.1.0") { - because 'Mirror preference dependency graph for -ktx artifacts' + because "Mirror preference dependency graph for -ktx artifacts" } api("androidx.fragment:fragment-ktx:1.2.4") { - because 'Mirror preference dependency graph for -ktx artifacts' + because "Mirror preference dependency graph for -ktx artifacts" } api(KOTLIN_STDLIB)
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle index ebb2548e..21edee3 100644 --- a/preference/preference/build.gradle +++ b/preference/preference/build.gradle
@@ -53,8 +53,8 @@ } sourceSets { main.res.srcDirs = [ - 'res', - 'res-public' + "res", + "res-public" ] } @@ -64,7 +64,7 @@ } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/recyclerview/recyclerview-lint/build.gradle b/recyclerview/recyclerview-lint/build.gradle index bb03512..a8dfc52 100644 --- a/recyclerview/recyclerview-lint/build.gradle +++ b/recyclerview/recyclerview-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle index 4e67cdc..a6fe293 100644 --- a/recyclerview/recyclerview/build.gradle +++ b/recyclerview/recyclerview/build.gradle
@@ -32,7 +32,7 @@ testImplementation(JUNIT) testImplementation(MOCKITO_CORE) testImplementation(KOTLIN_STDLIB) - lintPublish(project(':recyclerview:recyclerview-lint')) + lintPublish(project(":recyclerview:recyclerview-lint")) } android {
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle index f82aa3b..2c46eb7 100644 --- a/remotecallback/remotecallback/build.gradle +++ b/remotecallback/remotecallback/build.gradle
@@ -26,15 +26,15 @@ } dependencies { - api "androidx.annotation:annotation:1.1.0" - implementation project(':collection:collection') + api("androidx.annotation:annotation:1.1.0") + implementation(project(":collection:collection")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) - androidTestAnnotationProcessor project(":remotecallback:remotecallback-processor") + androidTestAnnotationProcessor (project(":remotecallback:remotecallback-processor")) } android {
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle index 05bb5d6..2aa19d3 100644 --- a/room/benchmark/build.gradle +++ b/room/benchmark/build.gradle
@@ -27,7 +27,7 @@ androidTestImplementation(project(":room:room-common")) androidTestImplementation(project(":room:room-runtime")) // depend on the shadowed version so that it tests with the shipped artifact - kaptAndroidTest project(path: ":room:room-compiler", configuration: 'shadowAndImplementation') + kaptAndroidTest project(path: ":room:room-compiler", configuration: "shadowAndImplementation") androidTestImplementation(project(":room:room-rxjava2")) androidTestImplementation("androidx.arch.core:core-runtime:2.0.1") androidTestImplementation(projectOrArtifact(":benchmark:benchmark-junit4"))
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle index ed7f3ea..e5dade8 100644 --- a/room/compiler/build.gradle +++ b/room/compiler/build.gradle
@@ -32,7 +32,7 @@ def antlrOut = "$buildDir/generated/antlr/grammar-gen/" sourceSets { - main.java.srcDirs += 'src/main/grammar-gen' + main.java.srcDirs += "src/main/grammar-gen" main.java.srcDirs += antlrOut } @@ -62,13 +62,13 @@ shadowJar { // set classifier to empty string so that it doesn't append anything to the jar. - archiveClassifier = '' + archiveClassifier = "" configurations = [project.configurations.shadowed] dependencies { // antlr has dependencies on unrelated projects for its gui stuff, do not include them - exclude(dependency('org.abego.treelayout:.*')) - exclude(dependency('org.glassfish:.*')) - exclude(dependency('com.ibm.icu:.*')) + exclude(dependency("org.abego.treelayout:.*")) + exclude(dependency("org.glassfish:.*")) + exclude(dependency("com.ibm.icu:.*")) } } @@ -76,7 +76,7 @@ // set a classifier on this one so that the output does not clash with the output from // shadowJar task. We should never use this directly as it won't have the shadowed classes that // are necessary to run. - archiveClassifier = 'before-jarjar' + archiveClassifier = "before-jarjar" } // relocate all shadow dependencies @@ -85,7 +85,7 @@ prefix = "androidx.room.jarjarred" } -tasks.shadowJar.dependsOn tasks.relocateShadowJar +tasks.shadowJar.dependsOn(tasks.relocateShadowJar) configurations { // replace the standard jar with the one built by 'shadowJar' in both api and runtime variants @@ -114,26 +114,26 @@ implementation(APACHE_COMMONS_CODEC) implementation(INTELLIJ_ANNOTATIONS) testImplementation(GOOGLE_COMPILE_TESTING) - testImplementation projectOrArtifact(":paging:paging-common") + testImplementation(projectOrArtifact(":paging:paging-common")) testImplementation(project(":room:room-compiler-processing-testing")) testImplementation(JUNIT) testImplementation(JSR250) testImplementation(MOCKITO_CORE) - testImplementation fileTree( + testImplementation(fileTree( dir: "${SdkHelperKt.getSdkPath(project)}/platforms/$SupportConfig.COMPILE_SDK_VERSION/", include : "android.jar" - ) - testImplementation fileTree( + )) + testImplementation(fileTree( dir: "${new File(project(":room:room-runtime").buildDir, "libJar")}", include : "*.jar" - ) - testImplementation fileTree( + )) + testImplementation(fileTree( dir: "${new File(project(":sqlite:sqlite").buildDir, "libJar")}", include : "*.jar" - ) + )) } -def generateAntlrTask = task('generateAntlrGrammar', type: JavaExec) { +def generateAntlrTask = task("generateAntlrGrammar", type: JavaExec) { def outFolder = file(antlrOut) outputs.dir(outFolder) inputs.file("$projectDir/SQLite.g4")
diff --git a/room/guava/build.gradle b/room/guava/build.gradle index bbb260a..d34babf 100644 --- a/room/guava/build.gradle +++ b/room/guava/build.gradle
@@ -28,7 +28,7 @@ dependencies { api(project(":room:room-common")) api(project(":room:room-runtime")) { - exclude group: 'com.google.guava', module: 'listenablefuture' + exclude group: "com.google.guava", module: "listenablefuture" } implementation("androidx.arch.core:core-runtime:2.0.1") api("androidx.annotation:annotation:1.0.0")
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle index e40523f..aafd894 100644 --- a/room/integration-tests/autovaluetestapp/build.gradle +++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -20,7 +20,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -35,7 +35,7 @@ // depend on the shadowed version so that it tests with the shipped artifact androidTestAnnotationProcessor project(path: ":room:room-compiler", - configuration: 'shadowAndImplementation') + configuration: "shadowAndImplementation") androidTestAnnotationProcessor(AUTO_VALUE) androidTestAnnotationProcessor(AUTO_VALUE_PARCEL)
diff --git a/room/integration-tests/incremental-annotation-processing/build.gradle b/room/integration-tests/incremental-annotation-processing/build.gradle index 8f3c9ca..8aeae46 100644 --- a/room/integration-tests/incremental-annotation-processing/build.gradle +++ b/room/integration-tests/incremental-annotation-processing/build.gradle
@@ -29,7 +29,7 @@ testImplementation(project(":internal-testutils-gradle-plugin")) testImplementation(JUNIT) testImplementation(TRUTH) - testImplementation gradleTestKit() + testImplementation(gradleTestKit()) } SdkResourceGenerator.generateForHostTest(project)
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle index 90b2caf..e782959 100644 --- a/room/integration-tests/kotlintestapp/build.gradle +++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -98,28 +98,28 @@ // this is a temporary attribute until KSP and AndroidX plugin supports variants. if (useKsp) { kspAndroidTest( - project(path: ":room:room-compiler", configuration: 'shadowAndImplementation') + project(path: ":room:room-compiler", configuration: "shadowAndImplementation") ) } else { kaptAndroidTest( - project(path: ":room:room-compiler", configuration: 'shadowAndImplementation') + project(path: ":room:room-compiler", configuration: "shadowAndImplementation") ) } androidTestImplementation(projectOrArtifact(":arch:core:core-runtime")) // Added for b/155802460 androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) { - exclude module: 'support-annotations' - exclude module: 'hamcrest-core' + exclude module: "support-annotations" + exclude module: "hamcrest-core" } androidTestImplementation(ESPRESSO_CORE, { - exclude group: 'com.android.support', module: 'support-annotations' + exclude group: "com.android.support", module: "support-annotations" exclude module: "hamcrest-core" }) androidTestImplementation(TRUTH) - androidTestImplementation project(':room:room-guava') - androidTestImplementation project(':room:room-testing') - androidTestImplementation project(':room:room-rxjava2') + androidTestImplementation(project(":room:room-guava")) + androidTestImplementation(project(":room:room-testing")) + androidTestImplementation(project(":room:room-rxjava2")) androidTestImplementation(project(":room:room-rxjava3")) androidTestImplementation(project(":room:room-ktx")) androidTestImplementation("androidx.arch.core:core-testing:2.0.1")
diff --git a/room/integration-tests/noappcompattestapp/build.gradle b/room/integration-tests/noappcompattestapp/build.gradle index 7ae47cf..a594cb2 100644 --- a/room/integration-tests/noappcompattestapp/build.gradle +++ b/room/integration-tests/noappcompattestapp/build.gradle
@@ -25,9 +25,9 @@ implementation(project(":room:room-runtime")) // depend on the shadowed version so that it tests with the shipped artifact annotationProcessor project(path: ":room:room-compiler", - configuration: 'shadowAndImplementation') + configuration: "shadowAndImplementation") androidTestAnnotationProcessor project(path: ":room:room-compiler", - configuration: 'shadowAndImplementation') + configuration: "shadowAndImplementation") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle index 8cf85ec..edcd26b 100644 --- a/room/integration-tests/testapp/build.gradle +++ b/room/integration-tests/testapp/build.gradle
@@ -20,7 +20,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -89,9 +89,9 @@ // use the shadowed dependency in tests so that if the shadowing does not work properly, // our tests fail. annotationProcessor project(path: ":room:room-compiler", - configuration: 'shadowAndImplementation') + configuration: "shadowAndImplementation") androidTestAnnotationProcessor project(path: ":room:room-compiler", - configuration: 'shadowAndImplementation') + configuration: "shadowAndImplementation") androidTestImplementation(project(":room:room-testing")) androidTestImplementation(project(":room:room-rxjava2"))
diff --git a/room/runtime/build.gradle b/room/runtime/build.gradle index eabb529..31b6246 100644 --- a/room/runtime/build.gradle +++ b/room/runtime/build.gradle
@@ -31,7 +31,7 @@ aidl = true } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } } @@ -42,7 +42,7 @@ implementation("androidx.arch.core:core-runtime:2.0.1") compileOnly("androidx.paging:paging-common:2.0.0") compileOnly("androidx.lifecycle:lifecycle-livedata-core:2.0.0") - implementation "androidx.annotation:annotation-experimental:1.1.0-beta01" + implementation("androidx.annotation:annotation-experimental:1.1.0-beta01") compileOnly KOTLIN_STDLIB // Due to :annotation-experimental testImplementation("androidx.arch.core:core-testing:2.0.1") @@ -71,9 +71,9 @@ // Create jar<variant> task for testImplementation in room-compiler. project.tasks.create(name: "jar${suffix}", type: Jar){ - dependsOn variant.javaCompileProvider.get() - from variant.javaCompileProvider.get().destinationDir - destinationDir new File(project.buildDir, "libJar") + dependsOn(variant.javaCompileProvider.get()) + from(variant.javaCompileProvider.get().destinationDir) + destinationDir(new File(project.buildDir, "libJar")) } }
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle index 013f345..6076b36 100644 --- a/samples/Support7Demos/build.gradle +++ b/samples/Support7Demos/build.gradle
@@ -11,13 +11,13 @@ api(KOTLIN_STDLIB) implementation(project(":appcompat:appcompat")) implementation(project(":cardview:cardview")) - implementation project(":drawerlayout:drawerlayout") + implementation(project(":drawerlayout:drawerlayout")) implementation(project(":gridlayout:gridlayout")) implementation(project(":mediarouter:mediarouter")) implementation(project(":palette:palette")) implementation(project(":recyclerview:recyclerview")) - implementation project(":recyclerview:recyclerview-selection") - implementation 'androidx.concurrent:concurrent-futures:1.1.0' + implementation(project(":recyclerview:recyclerview-selection")) + implementation("androidx.concurrent:concurrent-futures:1.1.0") api(MATERIAL) } @@ -25,7 +25,7 @@ buildTypes { release { minifyEnabled = true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } defaultConfig {
diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle index ec8ee33..1d1da74 100644 --- a/samples/SupportEmojiDemos/build.gradle +++ b/samples/SupportEmojiDemos/build.gradle
@@ -20,7 +20,7 @@ } ext { - fontDir = project(':noto-emoji-compat').projectDir + fontDir = project(":noto-emoji-compat").projectDir } dependencies { @@ -33,4 +33,4 @@ sourceSets { main.assets.srcDirs = [new File(fontDir, "supported-emojis").getAbsolutePath()] } -} \ No newline at end of file +}
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle index 39cd6d5..38daec1 100644 --- a/samples/SupportLeanbackDemos/build.gradle +++ b/samples/SupportLeanbackDemos/build.gradle
@@ -10,11 +10,11 @@ implementation(project(":leanback:leanback-preference")) implementation(project(":leanback:leanback-paging")) implementation(project(":leanback:leanback-tab")) - implementation('com.google.code.gson:gson:2.6.2') - implementation('androidx.room:room-runtime:2.3.0-alpha01') - implementation('androidx.lifecycle:lifecycle-extensions:2.2.0') + implementation("com.google.code.gson:gson:2.6.2") + implementation("androidx.room:room-runtime:2.3.0-alpha01") + implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") implementation(CONSTRAINT_LAYOUT, { transitive = true }) - annotationProcessor('androidx.room:room-compiler:2.3.0-alpha01') + annotationProcessor("androidx.room:room-compiler:2.3.0-alpha01") } android {
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle index bbe562e7..776ef35 100644 --- a/samples/SupportWearDemos/build.gradle +++ b/samples/SupportWearDemos/build.gradle
@@ -21,7 +21,7 @@ dependencies { implementation(project(":wear:wear")) - implementation project(path: ':appcompat:appcompat') + implementation(project(path: ":appcompat:appcompat")) } android {
diff --git a/settings.gradle b/settings.gradle index 203f192..ba08f5b 100644 --- a/settings.gradle +++ b/settings.gradle
@@ -174,7 +174,7 @@ includeProject(":browser:browser", "browser/browser", [BuildType.MAIN]) includeProject(":buildSrc-tests", "buildSrc-tests", [BuildType.MAIN]) // these projects intentionally fail to compile unless androidx.useMaxDepVersions is enabled -if (startParameter.projectProperties.containsKey('androidx.useMaxDepVersions')) { +if (startParameter.projectProperties.containsKey("androidx.useMaxDepVersions")) { includeProject(":buildSrc-tests:max-dep-versions:buildSrc-tests-max-dep-versions-dep", "buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep", [BuildType.MAIN]) includeProject(":buildSrc-tests:max-dep-versions:buildSrc-tests-max-dep-versions-main", "buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main", [BuildType.MAIN]) } @@ -677,4 +677,4 @@ // ///////////////////////////// -apply from: new File('buildSrc/remoteBuildCache.gradle') +apply from: new File("buildSrc/remoteBuildCache.gradle")
diff --git a/slices/builders/build.gradle b/slices/builders/build.gradle index e91c119..67df8f5 100644 --- a/slices/builders/build.gradle +++ b/slices/builders/build.gradle
@@ -27,8 +27,8 @@ dependencies { implementation(project(":slice-core")) api("androidx.remotecallback:remotecallback:1.0.0-alpha02") - api "androidx.annotation:annotation:1.1.0" - implementation "androidx.core:core:1.1.0" + api("androidx.annotation:annotation:1.1.0") + implementation("androidx.core:core:1.1.0") implementation("androidx.collection:collection:1.1.0") }
diff --git a/slices/core/build.gradle b/slices/core/build.gradle index 8d5f1d0..a0669c4 100644 --- a/slices/core/build.gradle +++ b/slices/core/build.gradle
@@ -26,9 +26,9 @@ } dependencies { - api "androidx.annotation:annotation:1.1.0" + api("androidx.annotation:annotation:1.1.0") implementation(project(":appcompat:appcompat")) - implementation "androidx.collection:collection:1.1.0" + implementation("androidx.collection:collection:1.1.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) @@ -36,7 +36,7 @@ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) - annotationProcessor project(":versionedparcelable:versionedparcelable-compiler") + annotationProcessor (project(":versionedparcelable:versionedparcelable-compiler")) } androidx {
diff --git a/slices/remotecallback/build.gradle b/slices/remotecallback/build.gradle index 4ddce1a..2849219 100644 --- a/slices/remotecallback/build.gradle +++ b/slices/remotecallback/build.gradle
@@ -26,7 +26,7 @@ } dependencies { - implementation "androidx.appcompat:appcompat:1.1.0" + implementation("androidx.appcompat:appcompat:1.1.0") implementation(project(":slice-core")) implementation(project(":remotecallback:remotecallback"))
diff --git a/slices/view/build.gradle b/slices/view/build.gradle index 29aa15a..f88be95 100644 --- a/slices/view/build.gradle +++ b/slices/view/build.gradle
@@ -26,7 +26,7 @@ dependencies { implementation(project(":slice-core")) - implementation project(":appcompat:appcompat") + implementation(project(":appcompat:appcompat")) implementation("androidx.recyclerview:recyclerview:1.2.0-beta01") implementation("androidx.collection:collection:1.1.0") api("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle index 0e47e38..3ff0a85 100644 --- a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle +++ b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
@@ -44,4 +44,4 @@ // studio pipeline works only starting with Android O minSdkVersion 26 } -} \ No newline at end of file +}
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle index 7800cc5..c7f6213 100644 --- a/sqlite/sqlite/build.gradle +++ b/sqlite/sqlite/build.gradle
@@ -36,9 +36,9 @@ def name = variant.name def suffix = name.capitalize() def jarTask = project.tasks.create(name: "jar${suffix}", type: Jar){ - dependsOn variant.javaCompileProvider.get() - from variant.javaCompileProvider.get().destinationDir - destinationDir new File(project.buildDir, "libJar") + dependsOn(variant.javaCompileProvider.get()) + from(variant.javaCompileProvider.get().destinationDir) + destinationDir(new File(project.buildDir, "libJar")) } }
diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle index 45a575d..7b408f1 100644 --- a/startup/integration-tests/first-library/build.gradle +++ b/startup/integration-tests/first-library/build.gradle
@@ -27,7 +27,7 @@ dependencies { api(KOTLIN_STDLIB) implementation(project(":startup:startup-runtime")) - implementation project(':work:work-runtime-ktx') + implementation(project(":work:work-runtime-ktx")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/startup/startup-runtime-lint/build.gradle b/startup/startup-runtime-lint/build.gradle index e8d93fc9..f18e03f 100644 --- a/startup/startup-runtime-lint/build.gradle +++ b/startup/startup-runtime-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle index 65cf91f..75c3825 100644 --- a/startup/startup-runtime/build.gradle +++ b/startup/startup-runtime/build.gradle
@@ -29,7 +29,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_7 @@ -39,8 +39,8 @@ dependencies { implementation("androidx.annotation:annotation:1.1.0") - implementation('androidx.tracing:tracing:1.0.0') - lintPublish(project(':startup:startup-runtime-lint')) + implementation("androidx.tracing:tracing:1.0.0") + lintPublish(project(":startup:startup-runtime-lint")) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle index 76e9634..3eb08fd 100644 --- a/swiperefreshlayout/swiperefreshlayout/build.gradle +++ b/swiperefreshlayout/swiperefreshlayout/build.gradle
@@ -23,12 +23,12 @@ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(project(":internal-testutils-espresso")) - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.swiperefreshlayout', module: 'swiperefreshlayout' - } - androidTestImplementation(project(':recyclerview:recyclerview')) { - exclude group: 'androidx.swiperefreshlayout', module: 'swiperefreshlayout' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.swiperefreshlayout", module: "swiperefreshlayout" + }) + androidTestImplementation(project(":recyclerview:recyclerview"), { + exclude group: "androidx.swiperefreshlayout", module: "swiperefreshlayout" + }) } androidx {
diff --git a/test/screenshot/build.gradle b/test/screenshot/build.gradle index 21e4e0a..8525b72 100644 --- a/test/screenshot/build.gradle +++ b/test/screenshot/build.gradle
@@ -25,9 +25,9 @@ } dependencies { - implementation "androidx.annotation:annotation:1.0.0" - implementation "androidx.core:core:1.5.0-alpha01" - implementation "androidx.test.screenshot:screenshot-proto:1.0.0-alpha01" + implementation("androidx.annotation:annotation:1.0.0") + implementation("androidx.core:core:1.5.0-alpha01") + implementation("androidx.test.screenshot:screenshot-proto:1.0.0-alpha01") implementation(KOTLIN_STDLIB) implementation(JUNIT) @@ -43,4 +43,4 @@ androidx { name = "AndroidX Library Screenshot Test" mavenGroup = LibraryGroups.TESTSCREENSHOT -} \ No newline at end of file +}
diff --git a/test/screenshot/proto/build.gradle b/test/screenshot/proto/build.gradle index dbd826e..48aa430 100644 --- a/test/screenshot/proto/build.gradle +++ b/test/screenshot/proto/build.gradle
@@ -33,7 +33,7 @@ protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.7.1' + artifact = "com.google.protobuf:protoc:3.7.1" } generateProtoTasks {
diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle index c7411cb..afd9243 100644 --- a/testutils/testutils-appcompat/build.gradle +++ b/testutils/testutils-appcompat/build.gradle
@@ -35,6 +35,6 @@ android { lintOptions { - disable 'InvalidPackage' // Lint is unhappy about junit package + disable "InvalidPackage" // Lint is unhappy about junit package } }
diff --git a/testutils/testutils-espresso/build.gradle b/testutils/testutils-espresso/build.gradle index f6f5fa5..0ba77aa 100644 --- a/testutils/testutils-espresso/build.gradle +++ b/testutils/testutils-espresso/build.gradle
@@ -31,6 +31,6 @@ android { lintOptions { - disable 'InvalidPackage' // Lint is unhappy about junit package + disable "InvalidPackage" // Lint is unhappy about junit package } }
diff --git a/testutils/testutils-runtime/build.gradle b/testutils/testutils-runtime/build.gradle index 05e325b..d315b6a 100644 --- a/testutils/testutils-runtime/build.gradle +++ b/testutils/testutils-runtime/build.gradle
@@ -33,7 +33,7 @@ android { lintOptions { - disable 'InvalidPackage' // Lint is unhappy about junit package + disable "InvalidPackage" // Lint is unhappy about junit package } defaultConfig { testInstrumentationRunner "androidx.testutils.ActivityRecyclingAndroidJUnitRunner"
diff --git a/text/text/build.gradle b/text/text/build.gradle index 3f5f325..f29d53b 100644 --- a/text/text/build.gradle +++ b/text/text/build.gradle
@@ -36,8 +36,8 @@ testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(JUNIT) - androidTestImplementation "androidx.core:core:1.5.0-alpha01" - androidTestImplementation project(":compose:ui:ui-test-font") + androidTestImplementation("androidx.core:core:1.5.0-alpha01") + androidTestImplementation(project(":compose:ui:ui-test-font")) androidTestImplementation(ANDROIDX_TEST_RULES) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) @@ -46,9 +46,9 @@ androidTestImplementation(JUNIT) androidTestImplementation(TRUTH) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation MOCKITO_KOTLIN, { - exclude group: 'org.mockito' // to keep control on the mockito version - } + androidTestImplementation(MOCKITO_KOTLIN, { + exclude group: "org.mockito" // to keep control on the mockito version + }) } androidx {
diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle index b62624c..cb19a01 100644 --- a/tracing/tracing-ktx/build.gradle +++ b/tracing/tracing-ktx/build.gradle
@@ -29,7 +29,7 @@ } dependencies { - api project(':tracing:tracing') + api project(":tracing:tracing") api(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle index 97f1428..7a472ef 100644 --- a/transition/transition/build.gradle +++ b/transition/transition/build.gradle
@@ -26,11 +26,11 @@ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker - androidTestImplementation project(":fragment:fragment") + androidTestImplementation(project(":fragment:fragment")) androidTestImplementation("androidx.appcompat:appcompat:1.1.0") - androidTestImplementation project(':internal-testutils-runtime'), { - exclude group: 'androidx.fragment', module: 'fragment' - } + androidTestImplementation(project(":internal-testutils-runtime"), { + exclude group: "androidx.fragment", module: "fragment" + }) } android { @@ -39,7 +39,7 @@ targetCompatibility = JavaVersion.VERSION_1_7 } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } aaptOptions {
diff --git a/vectordrawable/vectordrawable/build.gradle b/vectordrawable/vectordrawable/build.gradle index f5e1ba4..0e0aaf1 100644 --- a/vectordrawable/vectordrawable/build.gradle +++ b/vectordrawable/vectordrawable/build.gradle
@@ -42,4 +42,4 @@ inceptionYear = "2015" description = "Android Support VectorDrawable" failOnDeprecationWarnings = false -} \ No newline at end of file +}
diff --git a/viewpager2/integration-tests/testapp/build.gradle b/viewpager2/integration-tests/testapp/build.gradle index bf00bec..49792b8 100644 --- a/viewpager2/integration-tests/testapp/build.gradle +++ b/viewpager2/integration-tests/testapp/build.gradle
@@ -24,7 +24,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -38,7 +38,7 @@ implementation(project(":viewpager2:viewpager2")) implementation("androidx.activity:activity-ktx:1.1.0") implementation(MATERIAL) { - exclude group: 'androidx.viewpager2', module: 'viewpager2' + exclude group: "androidx.viewpager2", module: "viewpager2" } androidTestImplementation(ANDROIDX_TEST_RULES)
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle index 976410f..313262f 100644 --- a/viewpager2/viewpager2/build.gradle +++ b/viewpager2/viewpager2/build.gradle
@@ -40,12 +40,12 @@ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker androidTestImplementation(project(":internal-testutils-espresso")) - androidTestImplementation project(':internal-testutils-appcompat'), { - exclude group: 'androidx.viewpager2', module: 'viewpager2' + androidTestImplementation(project(":internal-testutils-appcompat"), { + exclude group: "androidx.viewpager2", module: "viewpager2" // The library depends on a specific core version above, meaning we can't use the // transitive AppCompat dep since that depends on ToT core:core... - exclude group: 'androidx.appcompat', module: 'appcompat' - } + exclude group: "androidx.appcompat", module: "appcompat" + }) // ... therefore we manually depend on AppCompat v1.1.0 androidTestImplementation("androidx.appcompat:appcompat:1.1.0") androidTestImplementation(KOTLIN_STDLIB)
diff --git a/wear/wear-input-testing/build.gradle b/wear/wear-input-testing/build.gradle index ffbd290..28d856d 100644 --- a/wear/wear-input-testing/build.gradle +++ b/wear/wear-input-testing/build.gradle
@@ -25,7 +25,7 @@ dependencies { api(project(":wear:wear-input")) - compileOnly fileTree(dir: '../wear_stubs', include: ['com.google.android.wearable-stubs.jar']) + compileOnly fileTree(dir: "../wear_stubs", include: ["com.google.android.wearable-stubs.jar"]) } android {
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle index f1b4d8b..c0d602d 100644 --- a/wear/wear-input/build.gradle +++ b/wear/wear-input/build.gradle
@@ -37,7 +37,7 @@ testImplementation(MOCKITO_CORE) testImplementation(project(":wear:wear-input-testing")) - compileOnly fileTree(dir: '../wear_stubs', include: ['com.google.android.wearable-stubs.jar']) + compileOnly(fileTree(dir: "../wear_stubs", include: ["com.google.android.wearable-stubs.jar"])) } android {
diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle index a6ae23c..d61dcea 100644 --- a/wear/wear-remote-interactions/build.gradle +++ b/wear/wear-remote-interactions/build.gradle
@@ -55,4 +55,4 @@ mavenVersion = LibraryVersions.WEAR_REMOTE_INTERACTIONS inceptionYear = "2020" description = "Android Wear Remote Interactions" -} \ No newline at end of file +}
diff --git a/wear/wear-tiles-data/build.gradle b/wear/wear-tiles-data/build.gradle index 1d5a2671..faf2576 100644 --- a/wear/wear-tiles-data/build.gradle +++ b/wear/wear-tiles-data/build.gradle
@@ -29,7 +29,7 @@ api("androidx.annotation:annotation:1.1.0") api(GUAVA_LISTENABLE_FUTURE) implementation(PROTOBUF_LITE) - implementation 'androidx.annotation:annotation:1.2.0-alpha01' + implementation("androidx.annotation:annotation:1.2.0-alpha01") testImplementation(ANDROIDX_TEST_EXT_JUNIT) testImplementation(ANDROIDX_TEST_CORE)
diff --git a/wear/wear-tiles/build.gradle b/wear/wear-tiles/build.gradle index 94432e1..b931026 100644 --- a/wear/wear-tiles/build.gradle +++ b/wear/wear-tiles/build.gradle
@@ -37,7 +37,7 @@ api("androidx.annotation:annotation:1.1.0") api(GUAVA_LISTENABLE_FUTURE) implementation(PROTOBUF_LITE) - implementation 'androidx.annotation:annotation:1.2.0-alpha01' + implementation"androidx.annotation:annotation:1.2.0-alpha01" testImplementation(ANDROIDX_TEST_EXT_JUNIT) testImplementation(ANDROIDX_TEST_EXT_TRUTH)
diff --git a/wear/wear-watchface-client/build.gradle b/wear/wear-watchface-client/build.gradle index 969e7ff..dc89440 100644 --- a/wear/wear-watchface-client/build.gradle +++ b/wear/wear-watchface-client/build.gradle
@@ -36,8 +36,8 @@ api(project(":wear:wear-complications-data")) api(KOTLIN_COROUTINES_ANDROID) - androidTestImplementation project(":test-screenshot") - androidTestImplementation project(":wear:wear-watchface-samples") + androidTestImplementation(project(":test-screenshot")) + androidTestImplementation(project(":wear:wear-watchface-samples")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/wear/wear-watchface-data/build.gradle b/wear/wear-watchface-data/build.gradle index 415605f..b87291a 100644 --- a/wear/wear-watchface-data/build.gradle +++ b/wear/wear-watchface-data/build.gradle
@@ -50,7 +50,7 @@ } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } }
diff --git a/wear/wear-watchface/build.gradle b/wear/wear-watchface/build.gradle index 00fb0e5..2977012 100644 --- a/wear/wear-watchface/build.gradle +++ b/wear/wear-watchface/build.gradle
@@ -38,8 +38,8 @@ implementation("androidx.core:core:1.1.0") - androidTestImplementation project(":test-screenshot") - androidTestImplementation project(":wear:wear-watchface-samples") + androidTestImplementation(project(":test-screenshot")) + androidTestImplementation(project(":wear:wear-watchface-samples")) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle index 3c16a59..a1aa6ae 100644 --- a/wear/wear/build.gradle +++ b/wear/wear/build.gradle
@@ -17,7 +17,7 @@ api("androidx.core:core:1.5.0-alpha04") api("androidx.versionedparcelable:versionedparcelable:1.1.1") - androidTestImplementation project(":test-screenshot") + androidTestImplementation(project(":test-screenshot")) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) @@ -32,11 +32,11 @@ testImplementation(ANDROIDX_TEST_RUNNER) testImplementation(ROBOLECTRIC) - implementation "androidx.core:core-ktx:1.5.0-alpha04" + implementation("androidx.core:core-ktx:1.5.0-alpha04") annotationProcessor(project(":versionedparcelable:versionedparcelable-compiler")) - compileOnly fileTree(dir: '../wear_stubs', include: ['com.google.android.wearable-stubs.jar']) + compileOnly(fileTree(dir: "../wear_stubs", include: ["com.google.android.wearable-stubs.jar"])) } android { @@ -45,7 +45,7 @@ } sourceSets { - main.res.srcDirs += 'src/main/res-public' + main.res.srcDirs += "src/main/res-public" androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear" }
diff --git a/webkit/integration-tests/testapp/build.gradle b/webkit/integration-tests/testapp/build.gradle index 2ee8be8..fe4acbc 100644 --- a/webkit/integration-tests/testapp/build.gradle +++ b/webkit/integration-tests/testapp/build.gradle
@@ -49,7 +49,7 @@ targetSdkVersion 29 } lintOptions { - disable 'UnusedResources' + disable "UnusedResources" } buildTypes { release {
diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle index 79c930c0..a640c8d 100644 --- a/webkit/webkit/build.gradle +++ b/webkit/webkit/build.gradle
@@ -55,8 +55,8 @@ buildTypes.all { consumerProguardFiles( - new File(webviewBoundaryInterfacesDir, 'proguard.flags'), - 'proguard-rules.pro' + new File(webviewBoundaryInterfacesDir, "proguard.flags"), + "proguard-rules.pro" ) } }
diff --git a/window/window-samples/build.gradle b/window/window-samples/build.gradle index 4e4a102..fa59bfc 100644 --- a/window/window-samples/build.gradle +++ b/window/window-samples/build.gradle
@@ -35,11 +35,11 @@ } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core-ktx:1.3.2' + implementation("androidx.appcompat:appcompat:1.2.0") + implementation("androidx.core:core-ktx:1.3.2") api(CONSTRAINT_LAYOUT, {transitive = true}) // TODO(b/152245564) Conflicting dependencies cause IDE errors. - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0' + implementation("androidx.lifecycle:lifecycle-viewmodel:2.2.0") implementation(project(":window:window")) }
diff --git a/window/window/build.gradle b/window/window/build.gradle index e780b24..db51a1c 100644 --- a/window/window/build.gradle +++ b/window/window/build.gradle
@@ -39,7 +39,7 @@ minSdkVersion 16 } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } sourceSets { String testUtilDir = 'src/testUtil/java' @@ -55,7 +55,7 @@ dependencies { implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.collection:collection:1.1.0") - implementation "androidx.core:core:1.3.2" + implementation("androidx.core:core:1.3.2") compileOnly(project(":window:window-extensions")) compileOnly(project(":window:window-sidecar"))
diff --git a/work/buildSrc/build.gradle b/work/buildSrc/build.gradle index 0822ff7..2a9efcc 100644 --- a/work/buildSrc/build.gradle +++ b/work/buildSrc/build.gradle
@@ -9,8 +9,8 @@ gradlePlugin { plugins { inspection { - id = 'androidx.inspection' - implementationClass = 'androidx.inspection.gradle.InspectionPlugin' + id = "androidx.inspection" + implementationClass = "androidx.inspection.gradle.InspectionPlugin" } } }
diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle index 4490a36..87093e5 100644 --- a/work/integration-tests/testapp/build.gradle +++ b/work/integration-tests/testapp/build.gradle
@@ -20,7 +20,7 @@ // TODO: Remove this when this test app no longer depends on 1.0.0 of vectordrawable-animated. // vectordrawable and vectordrawable-animated were accidentally using the same package name // which is no longer valid in namespaced resource world. - project.ext['android.uniquePackageNames'] = false + project.ext["android.uniquePackageNames"] = false } plugins { @@ -55,7 +55,7 @@ dependencies { // Using -Pandroidx.useMaxDepVersions does not use the right version of the annotation processor // Remove this workaround after b/127495641 is fixed - if (project.hasProperty('androidx.useMaxDepVersions')) { + if (project.hasProperty("androidx.useMaxDepVersions")) { annotationProcessor(projectOrArtifact(":room:room-compiler")) implementation(projectOrArtifact(":room:room-runtime")) } else { @@ -65,9 +65,9 @@ implementation(CONSTRAINT_LAYOUT, { transitive = true }) implementation("androidx.lifecycle:lifecycle-service:2.2.0") - implementation (project(':work:work-runtime-ktx')) - implementation (project(':work:work-multiprocess')) - implementation (project(':work:work-gcm')) + implementation(project(":work:work-runtime-ktx")) + implementation(project(":work:work-multiprocess")) + implementation(project(":work:work-gcm")) implementation("androidx.arch.core:core-runtime:2.1.0") implementation("androidx.recyclerview:recyclerview:1.1.0") implementation(MATERIAL)
diff --git a/work/workmanager-benchmark/build.gradle b/work/workmanager-benchmark/build.gradle index 6f518e4..b3e03d8 100644 --- a/work/workmanager-benchmark/build.gradle +++ b/work/workmanager-benchmark/build.gradle
@@ -30,8 +30,8 @@ } dependencies { - androidTestImplementation(project(':work:work-runtime-ktx')) - androidTestImplementation(project(':work:work-multiprocess')) + androidTestImplementation(project(":work:work-runtime-ktx")) + androidTestImplementation(project(":work:work-multiprocess")) androidTestImplementation(projectOrArtifact(":benchmark:benchmark-junit4")) androidTestImplementation("androidx.room:room-runtime:2.2.5") androidTestImplementation(JUNIT)
diff --git a/work/workmanager-gcm/build.gradle b/work/workmanager-gcm/build.gradle index d01d425..b87f85f 100644 --- a/work/workmanager-gcm/build.gradle +++ b/work/workmanager-gcm/build.gradle
@@ -29,11 +29,11 @@ } dependencies { - api project(':work:work-runtime') + api project(":work:work-runtime") implementation(GCM_NETWORK_MANAGER) // Using -Pandroidx.useMaxDepVersions does not use the right version of the annotation processor // Remove this workaround after b/127495641 is fixed - if (project.hasProperty('androidx.useMaxDepVersions')) { + if (project.hasProperty("androidx.useMaxDepVersions")) { annotationProcessor(projectOrArtifact(":room:room-compiler")) implementation(projectOrArtifact(":room:room-runtime")) androidTestImplementation(projectOrArtifact(":room:room-testing"))
diff --git a/work/workmanager-inspection/build.gradle b/work/workmanager-inspection/build.gradle index 4939922..698374c 100644 --- a/work/workmanager-inspection/build.gradle +++ b/work/workmanager-inspection/build.gradle
@@ -32,11 +32,11 @@ api(KOTLIN_STDLIB) compileOnly(projectOrArtifact(":inspection:inspection")) compileOnly("androidx.lifecycle:lifecycle-runtime:2.2.0") - compileOnly(project(':work:work-runtime')) + compileOnly(project(":work:work-runtime")) compileOnly("androidx.room:room-runtime:2.2.5") androidTestImplementation(project(":inspection:inspection-testing")) - androidTestImplementation(project(':work:work-runtime')) - androidTestImplementation(project(':work:work-runtime-ktx')) + androidTestImplementation(project(":work:work-runtime")) + androidTestImplementation(project(":work:work-runtime-ktx")) androidTestImplementation(ANDROIDX_TEST_RUNNER) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(TRUTH)
diff --git a/work/workmanager-ktx/build.gradle b/work/workmanager-ktx/build.gradle index 8a414fe..fa3953a 100644 --- a/work/workmanager-ktx/build.gradle +++ b/work/workmanager-ktx/build.gradle
@@ -30,7 +30,7 @@ } dependencies { - api project(':work:work-runtime') + api project(":work:work-runtime") api(KOTLIN_STDLIB) api(KOTLIN_COROUTINES_ANDROID)
diff --git a/work/workmanager-lint/build.gradle b/work/workmanager-lint/build.gradle index 80e500f..4e2674e 100644 --- a/work/workmanager-lint/build.gradle +++ b/work/workmanager-lint/build.gradle
@@ -28,15 +28,15 @@ // compileOnly because we use lintChecks and it doesn't allow other types of deps // this ugly hack exists because of b/63873667 if (rootProject.hasProperty("android.injected.invoked.from.ide")) { - compileOnly LINT_API_LATEST + compileOnly(LINT_API_LATEST) } else { - compileOnly LINT_API_MIN + compileOnly(LINT_API_MIN) } - compileOnly KOTLIN_STDLIB + compileOnly(KOTLIN_STDLIB) - testImplementation KOTLIN_STDLIB - testImplementation LINT_CORE - testImplementation LINT_TESTS + testImplementation(KOTLIN_STDLIB) + testImplementation(LINT_CORE) + testImplementation(LINT_TESTS) } androidx {
diff --git a/work/workmanager-multiprocess/build.gradle b/work/workmanager-multiprocess/build.gradle index fe1658c..94d9a0c 100644 --- a/work/workmanager-multiprocess/build.gradle +++ b/work/workmanager-multiprocess/build.gradle
@@ -30,7 +30,7 @@ android { buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } buildTypes { debug { @@ -40,7 +40,7 @@ } dependencies { - api project(':work:work-runtime') + api project(":work:work-runtime") api(GUAVA_LISTENABLE_FUTURE) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) @@ -49,7 +49,7 @@ androidTestImplementation(ESPRESSO_CORE) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has its own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) testImplementation(KOTLIN_STDLIB) testImplementation(JUNIT) }
diff --git a/work/workmanager-testing/build.gradle b/work/workmanager-testing/build.gradle index ae91a13..7018887 100644 --- a/work/workmanager-testing/build.gradle +++ b/work/workmanager-testing/build.gradle
@@ -29,7 +29,7 @@ } dependencies { - api(project(':work:work-runtime-ktx')) + api(project(":work:work-runtime-ktx")) implementation("androidx.lifecycle:lifecycle-livedata-core:2.1.0") implementation("androidx.room:room-runtime:2.2.5")
diff --git a/work/workmanager/build.gradle b/work/workmanager/build.gradle index 6cec8be9..6961031 100644 --- a/work/workmanager/build.gradle +++ b/work/workmanager/build.gradle
@@ -34,7 +34,7 @@ aidl = true } buildTypes.all { - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles "proguard-rules.pro" } buildTypes { debug { @@ -76,9 +76,9 @@ androidTestImplementation(ESPRESSO_CORE) androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has its own MockMaker androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has its own MockMaker - androidTestImplementation project(':internal-testutils-runtime') + androidTestImplementation(project(":internal-testutils-runtime")) testImplementation(JUNIT) - lintPublish(project(':work:work-runtime-lint')) + lintPublish(project(":work:work-runtime-lint")) } packageInspector(project, project(":work:work-inspection"))