Skip to content

Commit

Permalink
Merge pull request #487 from android/double_quote_to_single
Browse files Browse the repository at this point in the history 
Switch to use double quotes consistently in build.gradle files.
  • Loading branch information
@brettchabot
brettchabot authored Sep 12, 2023
2 parents 3dd50a1 + e5733e5 commit 910bd7c
Show file tree
Hide file tree
Showing 45 changed files with 294 additions and 294 deletions.
12 changes: 6 additions & 6 deletions integration/ServiceTestRuleSample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

android {
compileSdk 33
Expand Down Expand Up @@ -27,16 +27,16 @@ android {
}
}
}
namespace 'com.example.android.testing.ServiceTestRuleSample'
namespace "com.example.android.testing.ServiceTestRuleSample"
lint {
abortOnError false
}
}

dependencies {
// Testing-only dependencies
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion;
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
androidTestImplementation "androidx.test:rules:" + rootProject.rulesVersion;
}
2 changes: 1 addition & 1 deletion integration/ServiceTestRuleSample/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
26 changes: 13 additions & 13 deletions runner/AndroidJunitRunnerSample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"


android {
Expand All @@ -15,7 +15,7 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
productFlavors {
Expand All @@ -34,25 +34,25 @@ android {
}
}
}
useLibrary 'android.test.runner'
useLibrary "android.test.runner"

useLibrary 'android.test.base'
useLibrary 'android.test.mock'
namespace 'com.example.android.testing.androidjunitrunnersample'
useLibrary "android.test.base"
useLibrary "android.test.mock"
namespace "com.example.android.testing.androidjunitrunnersample"

}

dependencies {
// App's dependencies, including test
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
implementation "com.google.guava:guava:" + rootProject.guavaVersion

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

// https://truth.dev/
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
}
2 changes: 1 addition & 1 deletion runner/AndroidJunitRunnerSample/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
28 changes: 14 additions & 14 deletions runner/AndroidTestOrchestratorSample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

android {
compileSdk 33
Expand All @@ -10,19 +10,19 @@ android {
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
testInstrumentationRunnerArguments clearPackageData: "true"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
productFlavors {
}

testOptions {
execution 'ANDROIDX_TEST_ORCHESTRATOR'
execution "ANDROIDX_TEST_ORCHESTRATOR"
managedDevices {
devices {
// run with ../gradlew nexusOneApi30DebugAndroidTest
Expand All @@ -36,21 +36,21 @@ android {
}
}
}
namespace 'com.example.android.testing.androidtestorchestratorsample'
namespace "com.example.android.testing.androidtestorchestratorsample"
}

dependencies {
// App's dependencies, including test
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
implementation "com.google.guava:guava:" + rootProject.guavaVersion

// Testing-only dependencies
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
androidTestImplementation 'androidx.test:monitor:' + rootProject.monitorVersion;
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion;
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
androidTestImplementation "androidx.test:monitor:" + rootProject.monitorVersion;
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion;
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
androidTestUtil "androidx.test:orchestrator:" + rootProject.orchestratorVersion;

}
2 changes: 1 addition & 1 deletion runner/AndroidTestOrchestratorSample/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
28 changes: 14 additions & 14 deletions runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

android {
compileSdk 33
Expand All @@ -10,32 +10,32 @@ android {
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
testInstrumentationRunnerArguments useTestStorageService: 'true'
testInstrumentationRunnerArguments clearPackageData: "true"
testInstrumentationRunnerArguments useTestStorageService: "true"
}
buildTypes {
debug {
testCoverageEnabled true
}
}
testOptions {
execution 'ANDROIDX_TEST_ORCHESTRATOR'
execution "ANDROIDX_TEST_ORCHESTRATOR"
}
namespace 'com.example.android.testing.androidtestorchestratorsample'
namespace "com.example.android.testing.androidtestorchestratorsample"
}

dependencies {
// App's dependencies, including test
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion
implementation "com.google.guava:guava:" + rootProject.guavaVersion

// Testing-only dependencies
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
androidTestImplementation 'com.google.truth:truth:' + rootProject.truthVersion;
androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion
androidTestUtil 'androidx.test.services:test-services:' + rootProject.testServicesVersion
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
androidTestImplementation "com.google.truth:truth:" + rootProject.truthVersion;
androidTestUtil "androidx.test:orchestrator:" + rootProject.orchestratorVersion
androidTestUtil "androidx.test.services:test-services:" + rootProject.testServicesVersion

}
2 changes: 1 addition & 1 deletion runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
26 changes: 13 additions & 13 deletions ui/espresso/AccessibilitySample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

android {
compileSdk 33
Expand Down Expand Up @@ -36,8 +36,8 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.example.android.testing.espresso.AccessibilitySample'
testNamespace 'com.example.android.testing.espresso.AccessibilitySample.test'
namespace "com.example.android.testing.espresso.AccessibilitySample"
testNamespace "com.example.android.testing.espresso.AccessibilitySample.test"
lint {
abortOnError false
}
Expand All @@ -53,18 +53,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {

dependencies {
// App dependencies
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
implementation 'androidx.multidex:multidex:2.0.1'
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
implementation "com.google.guava:guava:" + rootProject.guavaVersion
implementation "androidx.multidex:multidex:2.0.1"

// Testing-only dependencies
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
androidTestImplementation('androidx.test.espresso:espresso-accessibility:' + rootProject.espressoVersion) {
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
androidTestImplementation("androidx.test.espresso:espresso-accessibility:" + rootProject.espressoVersion) {
// workaround for https://github.com/android/android-test/issues/861
exclude group: 'org.checkerframework', module: 'checker'
exclude group: "org.checkerframework", module: "checker"
}
androidTestImplementation 'com.google.truth:truth:1.1.3'
androidTestImplementation "com.google.truth:truth:1.1.3"
}
2 changes: 1 addition & 1 deletion ui/espresso/AccessibilitySample/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext.kotlinVersion = "1.7.10"
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
38 changes: 19 additions & 19 deletions ui/espresso/BasicSample/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"

apply plugin: 'kotlin-android'
apply plugin: "kotlin-android"

android {
compileSdk 33
Expand Down Expand Up @@ -33,8 +33,8 @@ android {
}
}
}
namespace 'com.example.android.testing.espresso.BasicSample'
testNamespace 'com.example.android.testing.espresso.BasicSample.test'
namespace "com.example.android.testing.espresso.BasicSample"
testNamespace "com.example.android.testing.espresso.BasicSample.test"
lint {
abortOnError false
}
Expand All @@ -48,23 +48,23 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {

dependencies {
// App dependencies
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
implementation "androidx.annotation:annotation:" + rootProject.androidxAnnotationVersion;
implementation "com.google.guava:guava:" + rootProject.guavaVersion

// Testing-only dependencies
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
androidTestImplementation 'androidx.test:core-ktx:' + rootProject.coreVersion
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
androidTestImplementation 'androidx.test.ext:junit-ktx:' + rootProject.extJUnitVersion
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
androidTestImplementation "androidx.test:core:" + rootProject.coreVersion
androidTestImplementation "androidx.test:core-ktx:" + rootProject.coreVersion
androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
androidTestImplementation "androidx.test.ext:junit-ktx:" + rootProject.extJUnitVersion
androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion
androidTestImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion

testImplementation 'androidx.test:core:' + rootProject.coreVersion;
testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:' + rootProject.robolectricVersion
testImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion
testImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion
testImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion
testImplementation "androidx.test:core:" + rootProject.coreVersion;
testImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion
testImplementation "junit:junit:4.12"
testImplementation "org.robolectric:robolectric:" + rootProject.robolectricVersion
testImplementation "androidx.test.espresso:espresso-core:" + rootProject.espressoVersion
testImplementation "androidx.test.espresso:espresso-intents:" + rootProject.espressoVersion
testImplementation "androidx.test.ext:truth:" + rootProject.extTruthVersion
}
2 changes: 1 addition & 1 deletion ui/espresso/BasicSample/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext.kotlinVersion = "1.8.20"
ext.agpVersion = '8.1.1'
ext.agpVersion = "8.1.1"
repositories {
// Insert local test repo here
google()
Expand Down
Loading

0 comments on commit 910bd7c

Please sign in to comment.