Skip to content

Commit 0265d9a

Browse files
brettchabotbrettchabot
committed
Migrate to androidx
1 parent 6eea847 commit 0265d9a

72 files changed

Lines changed: 394 additions & 427 deletions

File tree

Some content is hidden

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

‎integration/ServiceTestRuleSample/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 28
55
buildToolsVersion rootProject.buildToolsVersion
66
defaultConfig {
77
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
@@ -10,7 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212

13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
}
1515
lintOptions {
1616
abortOnError false
@@ -22,7 +22,7 @@ android {
2222
dependencies {
2323
// Testing-only dependencies
2424
// Force usage of support annotations in the test app, since it is internally used by the runner module.
25-
androidTestCompile 'com.android.support:support-annotations:' + rootProject.supportLibVersion;
26-
androidTestCompile 'com.android.support.test:runner:' + rootProject.runnerVersion;
27-
androidTestCompile 'com.android.support.test:rules:' + rootProject.rulesVersion;
25+
//androidTestImplementation 'androidx.annotation:annotation:1.0.0-beta01'
26+
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
27+
androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion;
2828
}

‎integration/ServiceTestRuleSample/app/src/androidTest/java/com/example/android/testing/ServiceTestRuleSample/LocalServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import android.content.Intent;
2020
import android.os.IBinder;
21-
import android.support.test.InstrumentationRegistry;
22-
import android.support.test.filters.MediumTest;
23-
import android.support.test.rule.ServiceTestRule;
24-
import android.support.test.runner.AndroidJUnit4;
21+
import androidx.test.InstrumentationRegistry;
22+
import androidx.test.filters.MediumTest;
23+
import androidx.test.rule.ServiceTestRule;
24+
import androidx.test.runner.AndroidJUnit4;
2525

2626
import org.junit.Rule;
2727
import org.junit.Test;

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ buildscript {
66
maven {
77
url "https://maven.google.com"
88
}
9+
google()
910
}
1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.0.1'
12+
classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
1213

1314
// NOTE: Do not place your application dependencies here; they belong
1415
// in the individual module build.gradle files
@@ -25,8 +26,8 @@ allprojects {
2526
}
2627

2728
ext {
28-
buildToolsVersion = "25.0.0"
29-
supportLibVersion = "25.4.0"
30-
runnerVersion = "1.0.0"
31-
rulesVersion = "1.0.0"
29+
buildToolsVersion = "27.0.3"
30+
supportLibVersion = "27.1.1"
31+
runnerVersion = "1.1.0-alpha3"
32+
rulesVersion = "1.1.0-alpha3"
3233
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Nov 05 14:10:42 GMT 2014
1+
#Mon Jul 16 11:21:15 PDT 2018
22
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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-all.zip

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616
buildTypes {
1717
release {
@@ -25,13 +25,13 @@ android {
2525

2626
dependencies {
2727
// App's dependencies, including test
28-
compile 'com.android.support:support-annotations:' + rootProject.supportLibVersion;
29-
compile 'com.google.guava:guava:18.0'
28+
implementation 'androidx.annotation:annotation:1.0.0-beta01';
29+
implementation 'com.google.guava:guava:18.0'
3030

3131
// Testing-only dependencies
3232
// Force usage of support annotations in the test app, since it is internally used by the runner module.
33-
androidTestCompile 'com.android.support:support-annotations:' + rootProject.supportLibVersion;
34-
androidTestCompile 'com.android.support.test:runner:' + rootProject.runnerVersion;
35-
androidTestCompile 'com.android.support.test:rules:' + rootProject.rulesVersion;
36-
androidTestCompile 'com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion;
33+
//androidTestImplementation 'com.android.support:support-annotations:' + rootProject.supportLibVersion;
34+
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
35+
androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion;
36+
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.runner.RunWith;
2222
import org.junit.runners.Parameterized;
2323

24-
import android.support.test.filters.SmallTest;
24+
import androidx.test.filters.SmallTest;
2525

2626
import java.lang.Iterable;
2727
import java.util.Arrays;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
2525
import org.junit.runner.RunWith;
2626

27-
import android.support.test.filters.LargeTest;
28-
import android.support.test.rule.ActivityTestRule;
29-
import android.support.test.runner.AndroidJUnit4;
30-
import android.support.test.runner.AndroidJUnitRunner;
27+
import androidx.test.filters.LargeTest;
28+
import androidx.test.rule.ActivityTestRule;
29+
import androidx.test.runner.AndroidJUnit4;
30+
import androidx.test.runner.AndroidJUnitRunner;
3131
import android.test.ActivityInstrumentationTestCase2;
3232

33-
import static android.support.test.espresso.Espresso.onView;
34-
import static android.support.test.espresso.action.ViewActions.click;
35-
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
36-
import static android.support.test.espresso.action.ViewActions.typeText;
37-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
38-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
39-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
33+
import static androidx.test.espresso.Espresso.onView;
34+
import static androidx.test.espresso.action.ViewActions.click;
35+
import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
36+
import static androidx.test.espresso.action.ViewActions.typeText;
37+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
38+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
39+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
4040

4141
/**
4242
* JUnit4 Ui Tests for {@link CalculatorActivity} using the {@link AndroidJUnitRunner}.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.junit.Test;
2121
import org.junit.runner.RunWith;
2222

23-
import android.support.test.filters.SmallTest;
24-
import android.support.test.runner.AndroidJUnit4;
23+
import androidx.test.filters.SmallTest;
24+
import androidx.test.runner.AndroidJUnit4;
2525

2626
import static org.hamcrest.CoreMatchers.equalTo;
2727
import static org.hamcrest.CoreMatchers.is;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.example.android.testing.androidjunitrunnersample;
1818

19-
import android.support.test.espresso.matcher.BoundedMatcher;
19+
import androidx.test.espresso.matcher.BoundedMatcher;
2020

2121
import org.hamcrest.Description;
2222
import org.hamcrest.Matcher;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
2222

23-
import android.support.test.filters.LargeTest;
24-
import android.support.test.runner.AndroidJUnitRunner;
23+
import androidx.test.filters.LargeTest;
24+
import androidx.test.runner.AndroidJUnitRunner;
2525
import android.test.ActivityInstrumentationTestCase2;
2626

2727
import static com.example.android.testing.androidjunitrunnersample.HintMatcher.withHint;
28-
import static android.support.test.espresso.Espresso.onView;
29-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
30-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
28+
import static androidx.test.espresso.Espresso.onView;
29+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
30+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3131
import static org.hamcrest.CoreMatchers.notNullValue;
3232
import static org.junit.Assert.assertThat;
3333

0 commit comments

Comments
 (0)