Skip to content

Commit 910bd7c

Browse files
brettchabotbrettchabot
authored
Merge pull request #487 from android/double_quote_to_single
Switch to use double quotes consistently in build.gradle files.
2 parents 3dd50a1 + e5733e5 commit 910bd7c

File tree

45 files changed

+294
-294
lines changed

Some content is hidden

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

45 files changed

+294
-294
lines changed

‎integration/ServiceTestRuleSample/app/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdk 33
@@ -27,16 +27,16 @@ android {
2727
}
2828
}
2929
}
30-
namespace 'com.example.android.testing.ServiceTestRuleSample'
30+
namespace "com.example.android.testing.ServiceTestRuleSample"
3131
lint {
3232
abortOnError false
3333
}
3434
}
3535

3636
dependencies {
3737
// Testing-only dependencies
38-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
39-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
40-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
41-
androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion;
38+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
39+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
40+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
41+
androidTestImplementation "androidx.test:rules:" + rootProject.rulesVersion;
4242
}

‎integration/ServiceTestRuleSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = '8.1.1'
4+
ext.agpVersion = "8.1.1"
55
repositories {
66
// Insert local test repo here
77
google()

‎runner/AndroidJunitRunnerSample/app/build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33

44
android {
@@ -15,7 +15,7 @@ android {
1515
buildTypes {
1616
release {
1717
minifyEnabled false
18-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
1919
}
2020
}
2121
productFlavors {
@@ -34,25 +34,25 @@ android {
3434
}
3535
}
3636
}
37-
useLibrary 'android.test.runner'
37+
useLibrary "android.test.runner"
3838

39-
useLibrary 'android.test.base'
40-
useLibrary 'android.test.mock'
41-
namespace 'com.example.android.testing.androidjunitrunnersample'
39+
useLibrary "android.test.base"
40+
useLibrary "android.test.mock"
41+
namespace "com.example.android.testing.androidjunitrunnersample"
4242

4343
}
4444

4545
dependencies {
4646
// App's dependencies, including test
47-
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
48-
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
47+
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
48+
implementation "com.google.guava:guava:" + rootProject.guavaVersion
4949

5050
// Testing-only dependencies
51-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
52-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
53-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
54-
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
51+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
52+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
53+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
54+
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion;
5555

5656
// https://truth.dev/
57-
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
57+
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
5858
}

‎runner/AndroidJunitRunnerSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = '8.1.1'
4+
ext.agpVersion = "8.1.1"
55
repositories {
66
// Insert local test repo here
77
google()

‎runner/AndroidTestOrchestratorSample/app/build.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdk 33
@@ -10,19 +10,19 @@ android {
1010
versionName "1.0"
1111

1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
13-
testInstrumentationRunnerArguments clearPackageData: 'true'
13+
testInstrumentationRunnerArguments clearPackageData: "true"
1414
}
1515
buildTypes {
1616
release {
1717
minifyEnabled false
18-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
1919
}
2020
}
2121
productFlavors {
2222
}
2323

2424
testOptions {
25-
execution 'ANDROIDX_TEST_ORCHESTRATOR'
25+
execution "ANDROIDX_TEST_ORCHESTRATOR"
2626
managedDevices {
2727
devices {
2828
// run with ../gradlew nexusOneApi30DebugAndroidTest
@@ -36,21 +36,21 @@ android {
3636
}
3737
}
3838
}
39-
namespace 'com.example.android.testing.androidtestorchestratorsample'
39+
namespace "com.example.android.testing.androidtestorchestratorsample"
4040
}
4141

4242
dependencies {
4343
// App's dependencies, including test
44-
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
45-
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
44+
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
45+
implementation "com.google.guava:guava:" + rootProject.guavaVersion
4646

4747
// Testing-only dependencies
48-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
49-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
50-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
51-
androidTestImplementation 'androidx.test:monitor:' + rootProject.monitorVersion;
52-
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
53-
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
54-
androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion;
48+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
49+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
50+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
51+
androidTestImplementation "androidx.test:monitor:" + rootProject.monitorVersion;
52+
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion;
53+
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
54+
androidTestUtil "androidx.test:orchestrator:" + rootProject.orchestratorVersion;
5555

5656
}

‎runner/AndroidTestOrchestratorSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = '8.1.1'
4+
ext.agpVersion = "8.1.1"
55
repositories {
66
// Insert local test repo here
77
google()

‎runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdk 33
@@ -10,32 +10,32 @@ android {
1010
versionName "1.0"
1111

1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
13-
testInstrumentationRunnerArguments clearPackageData: 'true'
14-
testInstrumentationRunnerArguments useTestStorageService: 'true'
13+
testInstrumentationRunnerArguments clearPackageData: "true"
14+
testInstrumentationRunnerArguments useTestStorageService: "true"
1515
}
1616
buildTypes {
1717
debug {
1818
testCoverageEnabled true
1919
}
2020
}
2121
testOptions {
22-
execution 'ANDROIDX_TEST_ORCHESTRATOR'
22+
execution "ANDROIDX_TEST_ORCHESTRATOR"
2323
}
24-
namespace 'com.example.android.testing.androidtestorchestratorsample'
24+
namespace "com.example.android.testing.androidtestorchestratorsample"
2525
}
2626

2727
dependencies {
2828
// App's dependencies, including test
29-
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion
30-
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
29+
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion
30+
implementation "com.google.guava:guava:" + rootProject.guavaVersion
3131

3232
// Testing-only dependencies
33-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
34-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
35-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
36-
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
37-
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
38-
androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion
39-
androidTestUtil 'androidx.test.services:test-services:' + rootProject.testServicesVersion
33+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
34+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
35+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
36+
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
37+
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
38+
androidTestUtil "androidx.test:orchestrator:" + rootProject.orchestratorVersion
39+
androidTestUtil "androidx.test.services:test-services:" + rootProject.testServicesVersion
4040

4141
}

‎runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.agpVersion = '8.1.1'
4+
ext.agpVersion = "8.1.1"
55
repositories {
66
// Insert local test repo here
77
google()

‎ui/espresso/AccessibilitySample/app/build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdk 33
@@ -36,8 +36,8 @@ android {
3636
sourceCompatibility JavaVersion.VERSION_1_8
3737
targetCompatibility JavaVersion.VERSION_1_8
3838
}
39-
namespace 'com.example.android.testing.espresso.AccessibilitySample'
40-
testNamespace 'com.example.android.testing.espresso.AccessibilitySample.test'
39+
namespace "com.example.android.testing.espresso.AccessibilitySample"
40+
testNamespace "com.example.android.testing.espresso.AccessibilitySample.test"
4141
lint {
4242
abortOnError false
4343
}
@@ -53,18 +53,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
5353

5454
dependencies {
5555
// App dependencies
56-
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
57-
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
58-
implementation 'androidx.multidex:multidex:2.0.1'
56+
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
57+
implementation "com.google.guava:guava:" + rootProject.guavaVersion
58+
implementation "androidx.multidex:multidex:2.0.1"
5959

6060
// Testing-only dependencies
61-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
62-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
63-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
64-
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
65-
androidTestImplementation('androidx.test.espresso:espresso-accessibility:' + rootProject.espressoVersion) {
61+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
62+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
63+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
64+
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
65+
androidTestImplementation("androidx.test.espresso:espresso-accessibility:" + rootProject.espressoVersion) {
6666
// workaround for https://github.com/android/android-test/issues/861
67-
exclude group: 'org.checkerframework', module: 'checker'
67+
exclude group: "org.checkerframework", module: "checker"
6868
}
69-
androidTestImplementation 'com.google.truth:truth:1.1.3'
69+
androidTestImplementation "com.google.truth:truth:1.1.3"
7070
}

‎ui/espresso/AccessibilitySample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44
ext.kotlinVersion = "1.7.10"
5-
ext.agpVersion = '8.1.1'
5+
ext.agpVersion = "8.1.1"
66
repositories {
77
// Insert local test repo here
88
google()

‎ui/espresso/BasicSample/app/build.gradle

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

3-
apply plugin: 'kotlin-android'
3+
apply plugin: "kotlin-android"
44

55
android {
66
compileSdk 33
@@ -33,8 +33,8 @@ android {
3333
}
3434
}
3535
}
36-
namespace 'com.example.android.testing.espresso.BasicSample'
37-
testNamespace 'com.example.android.testing.espresso.BasicSample.test'
36+
namespace "com.example.android.testing.espresso.BasicSample"
37+
testNamespace "com.example.android.testing.espresso.BasicSample.test"
3838
lint {
3939
abortOnError false
4040
}
@@ -48,23 +48,23 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
4848

4949
dependencies {
5050
// App dependencies
51-
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
52-
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
51+
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
52+
implementation "com.google.guava:guava:" + rootProject.guavaVersion
5353

5454
// Testing-only dependencies
5555
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
56-
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
57-
androidTestImplementation 'androidx.test:core-ktx:' + rootProject.coreVersion
58-
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
59-
androidTestImplementation 'androidx.test.ext:junit-ktx:' + rootProject.extJUnitVersion
60-
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
61-
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
56+
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
57+
androidTestImplementation "androidx.test:core-ktx:" + rootProject.coreVersion
58+
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
59+
androidTestImplementation "androidx.test.ext:junit-ktx:" + rootProject.extJUnitVersion
60+
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
61+
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
6262

63-
testImplementation 'androidx.test:core:' + rootProject.coreVersion;
64-
testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
65-
testImplementation 'junit:junit:4.12'
66-
testImplementation 'org.robolectric:robolectric:' + rootProject.robolectricVersion
67-
testImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
68-
testImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion
69-
testImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion
63+
testImplementation "androidx.test:core:" + rootProject.coreVersion;
64+
testImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
65+
testImplementation "junit:junit:4.12"
66+
testImplementation "org.robolectric:robolectric:" + rootProject.robolectricVersion
67+
testImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
68+
testImplementation "androidx.test.espresso:espresso-intents:" + rootProject.espressoVersion
69+
testImplementation "androidx.test.ext:truth:" + rootProject.extTruthVersion
7070
}

‎ui/espresso/BasicSample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44
ext.kotlinVersion = "1.8.20"
5-
ext.agpVersion = '8.1.1'
5+
ext.agpVersion = "8.1.1"
66
repositories {
77
// Insert local test repo here
88
google()

0 commit comments

Comments
 (0)