Skip to content

Commit c89cff4

Browse files
committed
fix bazel build
1 parent b5d6062 commit c89cff4

File tree

39 files changed

+54
-52
lines changed

39 files changed

+54
-52
lines changed

WORKSPACE

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Set the path to your local SDK installation, or use the ANDROID_HOME environment variable.
22
android_sdk_repository(
33
name = "androidsdk",
4+
api_level = 28,
5+
build_tools_version = "28.0.2",
46
# path = "/path/to/sdk",
57
)
68

integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

runner/AndroidJunitRunnerSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1818
1. Check out the relevant code:
1919
* The application under test is located in `src/main/java`
2020
* Tests are in `src/androidTest/java`
21-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
21+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
2222
* Open *Run* menu | *Edit Configurations*
2323
* Add a new *Android Tests* configuration
2424
* Choose a module
2525
* Choose which tests to run. Click on Test: class and select one of the TestSuites
2626
(AndroidTestSuite, UnitTestSuite, InstrumentationTestSuite)
27-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
27+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
2828
1. Connect a device or start an emulator
2929
* Turn animations off.
3030
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

runner/AndroidJunitRunnerSample/app/src/androidTest/java/com/example/android/testing/androidjunitrunnersample/CalculatorInstrumentationTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import androidx.test.rule.ActivityTestRule;
2929
import androidx.test.runner.AndroidJUnit4;
3030
import androidx.test.runner.AndroidJUnitRunner;
31-
import android.test.ActivityInstrumentationTestCase2;
3231

3332
import static androidx.test.espresso.Espresso.onView;
3433
import static androidx.test.espresso.action.ViewActions.click;
@@ -53,7 +52,7 @@ public class CalculatorInstrumentationTest {
5352

5453
/**
5554
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
56-
* for {@link ActivityInstrumentationTestCase2}.
55+
* for {@link android.test.ActivityInstrumentationTestCase2}.
5756
* <p>
5857
* Rules are interceptors which are executed for each test method and will run before
5958
* any of your setup code in the {@link Before @Before} method.

runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ui/espresso/BasicSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1010
1. Check out the relevant code:
1111
* The application under test is located in `src/main/java`
1212
* Tests are in `src/androidTest/java`
13-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
13+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1414
* Open *Run* menu | *Edit Configurations*
1515
* Add a new *Android Tests* configuration
1616
* Choose a module
17-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
17+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
1818
1. Connect a device or start an emulator
1919
* Turn animations off.
2020
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/BasicSample/app/src/androidTest/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package="com.example.android.testing.espresso.BasicSample"
2020
android:versionCode="1"
2121
android:versionName="1.0">
22+
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
2223

2324
<instrumentation android:targetPackage="com.example.android.testing.espresso.BasicSample"
2425
android:name="androidx.test.runner.AndroidJUnitRunner"/>

ui/espresso/BasicSample/app/src/androidTest/java/com/example/android/testing/espresso/BasicSample/ChangeTextBehaviorTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import androidx.test.rule.ActivityTestRule;
2828
import androidx.test.runner.AndroidJUnit4;
2929
import androidx.test.filters.LargeTest;
30-
import android.test.ActivityInstrumentationTestCase2;
3130

3231
import static androidx.test.espresso.Espresso.onView;
3332
import static androidx.test.espresso.action.ViewActions.click;
@@ -52,7 +51,7 @@ public class ChangeTextBehaviorTest {
5251

5352
/**
5453
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
55-
* for {@link ActivityInstrumentationTestCase2}.
54+
* for {@link android.test.ActivityInstrumentationTestCase2}.
5655
* <p>
5756
* Rules are interceptors which are executed for each test method and will run before
5857
* any of your setup code in the {@link Before @Before} method.

ui/espresso/BasicSample/app/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="com.example.android.testing.espresso.BasicSample" >
2020

21+
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
22+
2123
<application
2224
android:icon="@drawable/ic_launcher"
2325
android:label="@string/app_name"

ui/espresso/BasicSampleBundled/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
</application>
2727

2828
<instrumentation
29-
android:name="android.support.test.runner.AndroidJUnitRunner"
29+
android:name="androidx.test.runner.AndroidJUnitRunner"
3030
android:targetPackage="com.example.android.testing.espresso.basicsamplebundled" />
3131
</manifest>

ui/espresso/BasicSampleBundled/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ The problem is that the same LICENSE.TXT file is found multiple times and AAPT d
1212
1. Check out the relevant code:
1313
* The application under test is located in `src/`
1414
* Tests are in `tests/`
15-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
15+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1616
* Open *Run* menu | *Run Configurations*
1717
* Click on Android JUnit Test
1818
* Add a new configuration by pressing the "new launch configuration" button
1919
* Select your project by clicking the "Browse" button
20-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
20+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
2121
1. Connect a device or start an emulator
2222
* Turn animations off.
2323
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/ChangeTextBehaviorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
import androidx.test.espresso.matcher.ViewMatchers;
3535
import androidx.test.rule.ActivityTestRule;
3636
import androidx.test.runner.AndroidJUnit4;
37-
import android.test.ActivityInstrumentationTestCase2;
38-
import android.test.suitebuilder.annotation.LargeTest;
37+
import androidx.test.filters.LargeTest;
3938

4039
import com.example.android.testing.espresso.basicsamplebundled.MainActivity;
4140
import com.example.android.testing.espresso.basicsamplebundled.R;
@@ -57,7 +56,7 @@ public class ChangeTextBehaviorTest {
5756

5857
/**
5958
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
60-
* for {@link ActivityInstrumentationTestCase2}.
59+
* for {@link android.test.ActivityInstrumentationTestCase2}.
6160
* <p>
6261
* Rules are interceptors which are executed for each test method and will run before
6362
* any of your setup code in the {@link Before @Before} method.

ui/espresso/CustomMatcherSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1010
1. Check out the relevant code:
1111
* The application under test is located in `src/main/java`
1212
* Tests are in `src/androidTest/java`
13-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
13+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1414
* Open *Run* menu | *Edit Configurations*
1515
* Add a new *Android Tests* configuration
1616
* Choose a module
17-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
17+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
1818
1. Connect a device or start an emulator
1919
* Turn animations off.
2020
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/CustomMatcherSample/app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
88

99
<instrumentation android:targetPackage="com.example.android.testing.espresso.CustomMatcherSample"
10-
android:name="android.support.test.runner.AndroidJUnitRunner"/>
10+
android:name="androidx.test.runner.AndroidJUnitRunner"/>
1111

1212
<application tools:replace="label" android:label="CustomMatcherSampleTest" />
1313
</manifest>

ui/espresso/CustomMatcherSample/app/src/androidTest/java/com/example/android/testing/espresso/CustomMatcherSample/HintMatchersTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import androidx.test.filters.LargeTest;
2525
import androidx.test.rule.ActivityTestRule;
2626
import androidx.test.runner.AndroidJUnit4;
27-
import android.test.ActivityInstrumentationTestCase2;
2827

2928
import static androidx.test.espresso.Espresso.onView;
3029
import static androidx.test.espresso.action.ViewActions.click;
@@ -54,7 +53,7 @@ public class HintMatchersTest {
5453

5554
/**
5655
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
57-
* for {@link ActivityInstrumentationTestCase2}.
56+
* for {@link android.test.ActivityInstrumentationTestCase2}.
5857
* <p>
5958
* Rules are interceptors which are executed for each test method and will run before
6059
* any of your setup code in the {@link Before @Before} method.

ui/espresso/CustomMatcherSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ui/espresso/DataAdapterSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1313
1. Check out the relevant code:
1414
* The application under test is located in `src/main/java`
1515
* Tests are in `src/androidTest/java`
16-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
16+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1717
* Open *Run* menu | *Edit Configurations*
1818
* Add a new *Android Tests* configuration
1919
* Choose a module
20-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
20+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
2121
1. Connect a device or start an emulator
2222
* Turn animations off.
2323
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/DataAdapterSample/app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
88

99
<instrumentation android:targetPackage="com.example.android.testing.espresso.DataAdapterSample"
10-
android:name="android.support.test.runner.AndroidJUnitRunner"/>
10+
android:name="androidx.test.runner.AndroidJUnitRunner"/>
1111

1212
<application tools:replace="label" android:label="DataAdapterSampleTest" />
1313
</manifest>

ui/espresso/DataAdapterSample/app/src/androidTest/java/com/example/android/testing/espresso/DataAdapterSample/LongListActivityTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import androidx.test.filters.LargeTest;
2929
import androidx.test.rule.ActivityTestRule;
3030
import androidx.test.runner.AndroidJUnit4;
31-
import android.test.ActivityInstrumentationTestCase2;
3231

3332
import static androidx.test.espresso.Espresso.onData;
3433
import static androidx.test.espresso.Espresso.onView;
@@ -66,7 +65,7 @@ public class LongListActivityTest {
6665

6766
/**
6867
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
69-
* for {@link ActivityInstrumentationTestCase2}.
68+
* for {@link android.test.ActivityInstrumentationTestCase2}.
7069
* <p>
7170
* Rules are interceptors which are executed for each test method and will run before
7271
* any of your setup code in the {@link Before @Before} method.

ui/espresso/DataAdapterSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ui/espresso/IdlingResourceSample/app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
88

99
<instrumentation android:targetPackage="com.example.android.testing.espresso.IdlingResourceSample"
10-
android:name="android.support.test.runner.AndroidJUnitRunner"/>
10+
android:name="androidx.test.runner.AndroidJUnitRunner"/>
1111

1212
<application tools:replace="label" android:label="IdlingResourceSampleTest" />
1313
</manifest>

ui/espresso/IntentsAdvancedSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1212
1. Check out the relevant code:
1313
* The application under test is located in `src/main/java`
1414
* Tests are in `src/androidTest/java`
15-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
15+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1616
* Open *Run* menu | *Edit Configurations*
1717
* Add a new *Android Tests* configuration
1818
* Choose a module
19-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
19+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
2020
1. Connect a device or start an emulator
2121
* Turn animations off.
2222
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/IntentsAdvancedSample/app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:required="true"/>
1212

1313
<instrumentation android:targetPackage="com.example.android.testing.espresso.intents.AdvancedSample"
14-
android:name="android.support.test.runner.AndroidJUnitRunner"/>
14+
android:name="androidx.test.runner.AndroidJUnitRunner"/>
1515

1616
<application tools:replace="label" android:label="IntentsBasicSampleTest" />
1717
</manifest>

ui/espresso/IntentsBasicSample/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android_library(
1010
resource_files = glob(["app/src/main/res/**/*"]),
1111
deps = [
1212
gmaven_artifact("androidx.annotation:annotation:1.0.0"),
13-
gmaven_artifact("androidx.legacy:legacy-support-v4:aar:1.0.0"),
13+
gmaven_artifact("androidx.core:core:aar:1.0.0"),
1414
"@com_google_guava_guava//jar",
1515
],
1616
)

ui/espresso/IntentsBasicSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1111
1. Check out the relevant code:
1212
* The application under test is located in `src/main/java`
1313
* Tests are in `src/androidTest/java`
14-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
14+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
1515
* Open *Run* menu | *Edit Configurations*
1616
* Add a new *Android Tests* configuration
1717
* Choose a module
18-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
18+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
1919
1. Connect a device or start an emulator
2020
* Turn animations off.
2121
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/IntentsBasicSample/app/src/androidTest/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package="com.example.android.testing.espresso.BasicSample"
55
android:versionCode="1"
66
android:versionName="1.0">
7+
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
78

89
<uses-permission android:name="android.permission.CALL_PHONE"/>
910

ui/espresso/IntentsBasicSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ui/espresso/MultiProcessSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ui/espresso/MultiWindowSample/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
2424
1. Check out the relevant code:
2525
* The application under test is located in `src/main/java`
2626
* Tests are in `src/androidTest/java`
27-
1. Create the test configuration with a custom runner: `android.support.test.runner.AndroidJUnitRunner`
27+
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
2828
* Open *Run* menu | *Edit Configurations*
2929
* Add a new *Android Tests* configuration
3030
* Choose a module
31-
* Add a *Specific instrumentation runner*: `android.support.test.runner.AndroidJUnitRunner`
31+
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
3232
1. Connect a device or start an emulator
3333
* Turn animations off.
3434
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

ui/espresso/MultiWindowSample/app/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
88

99
<instrumentation android:targetPackage="com.example.android.testing.espresso.MultiWindowSample"
10-
android:name="android.support.test.runner.AndroidJUnitRunner"/>
10+
android:name="androidx.test.runner.AndroidJUnitRunner"/>
1111

1212
<application tools:replace="label" android:label="IntentsMultiWindowSampleTest" />
1313
</manifest>

ui/espresso/MultiWindowSample/app/src/androidTest/java/com/example/android/testing/espresso/MultiWindowSample/MultiWindowTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import androidx.test.filters.LargeTest;
1919
import androidx.test.rule.ActivityTestRule;
2020
import androidx.test.runner.AndroidJUnit4;
21-
import android.test.ActivityInstrumentationTestCase2;
2221

2322
import org.junit.Before;
2423
import org.junit.Rule;
@@ -71,7 +70,7 @@ public class MultiWindowTest {
7170

7271
/**
7372
* A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
74-
* for {@link ActivityInstrumentationTestCase2}.
73+
* for {@link android.test.ActivityInstrumentationTestCase2}.
7574
* <p>
7675
* Rules are interceptors which are executed for each test method and will run before
7776
* any of your setup code in the {@link Before @Before} method.

ui/espresso/RecyclerViewSample/app/src/androidTest/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package="com.example.android.testing.espresso.RecyclerViewSample"
55
android:versionCode="1"
66
android:versionName="1.0">
7+
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
78

89
<instrumentation android:targetPackage="com.example.android.testing.espresso.RecyclerViewSample"
910
android:name="androidx.test.runner.AndroidJUnitRunner"/>

ui/espresso/RecyclerViewSample/app/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="com.example.android.testing.espresso.RecyclerViewSample" >
2020

21+
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
22+
2123
<application
2224
android:icon="@drawable/ic_launcher"
2325
android:label="@string/app_name"

ui/espresso/RecyclerViewSample/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)