Skip to content

Commit 78db16e

Browse files
swapiiswapii
committed
Force AndroidX
Also update ButterKnife to 10.2.0.
1 parent ba3a891 commit 78db16e

Some content is hidden

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

55 files changed

+301
-265
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ dependencies {
120120

121121
compile 'com.github.swapii:PersistentCookieJar:1.0.0'
122122

123-
compile 'com.jakewharton:butterknife:9.0.0'
124-
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0'
123+
compile 'com.jakewharton:butterknife:10.2.0'
124+
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
125125

126126
compile 'de.greenrobot:eventbus:2.4.0'
127127

‎app/src/androidTest/java/four/pda/AboutActivityTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import android.os.Environment;
44
import android.os.RemoteException;
5-
import android.support.test.InstrumentationRegistry;
6-
import android.support.test.rule.ActivityTestRule;
7-
import android.support.test.runner.AndroidJUnit4;
8-
import android.support.test.uiautomator.UiDevice;
9-
import android.support.test.uiautomator.UiObject;
10-
import android.support.test.uiautomator.UiObjectNotFoundException;
11-
import android.support.test.uiautomator.UiSelector;
12-
import android.test.suitebuilder.annotation.SmallTest;
5+
6+
import androidx.test.InstrumentationRegistry;
7+
import androidx.test.filters.SmallTest;
8+
import androidx.test.rule.ActivityTestRule;
9+
import androidx.test.runner.AndroidJUnit4;
10+
import androidx.test.uiautomator.UiDevice;
11+
import androidx.test.uiautomator.UiObject;
12+
import androidx.test.uiautomator.UiObjectNotFoundException;
13+
import androidx.test.uiautomator.UiSelector;
1314

1415
import org.junit.Before;
1516
import org.junit.Rule;
@@ -21,12 +22,12 @@
2122
import four.pda.ui.AboutActivity;
2223
import four.pda.ui.AboutActivity_;
2324

24-
import static android.support.test.espresso.Espresso.onView;
25-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
26-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
27-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
28-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
29-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
25+
import static androidx.test.espresso.Espresso.onView;
26+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
27+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
28+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
29+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
30+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
3031

3132
/**
3233
* Created by Klishin.Pavel on 08.02.2016.

‎app/src/androidTest/java/four/pda/AllArticlesTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import android.os.Environment;
44
import android.os.RemoteException;
5-
import android.support.test.InstrumentationRegistry;
6-
import android.support.test.rule.ActivityTestRule;
7-
import android.support.test.runner.AndroidJUnit4;
8-
import android.support.test.uiautomator.UiDevice;
9-
import android.support.test.uiautomator.UiObject;
10-
import android.support.test.uiautomator.UiObjectNotFoundException;
11-
import android.support.test.uiautomator.UiSelector;
12-
import android.test.suitebuilder.annotation.SmallTest;
5+
import androidx.test.InstrumentationRegistry;
6+
import androidx.test.filters.SmallTest;
7+
import androidx.test.rule.ActivityTestRule;
8+
import androidx.test.runner.AndroidJUnit4;
9+
import androidx.test.uiautomator.UiDevice;
10+
import androidx.test.uiautomator.UiObject;
11+
import androidx.test.uiautomator.UiObjectNotFoundException;
12+
import androidx.test.uiautomator.UiSelector;
1313

1414
import org.junit.Before;
1515
import org.junit.Rule;
@@ -21,15 +21,15 @@
2121
import four.pda.ui.article.NewsActivity;
2222
import four.pda.ui.article.NewsActivity_;
2323

24-
import static android.support.test.espresso.Espresso.onView;
25-
import static android.support.test.espresso.Espresso.pressBack;
26-
import static android.support.test.espresso.action.ViewActions.click;
27-
import static android.support.test.espresso.action.ViewActions.swipeDown;
28-
import static android.support.test.espresso.action.ViewActions.swipeUp;
29-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
30-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
31-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
32-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
24+
import static androidx.test.espresso.Espresso.onView;
25+
import static androidx.test.espresso.Espresso.pressBack;
26+
import static androidx.test.espresso.action.ViewActions.click;
27+
import static androidx.test.espresso.action.ViewActions.swipeDown;
28+
import static androidx.test.espresso.action.ViewActions.swipeUp;
29+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
30+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
31+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
32+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3333

3434
/**
3535
* Created by Klishin.Pavel on 08.02.2016.

‎app/src/androidTest/java/four/pda/ArticlesActivityTest.java‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.SmallTest;
4+
5+
6+
import androidx.test.InstrumentationRegistry;
7+
import androidx.test.filters.SmallTest;
8+
import androidx.test.rule.ActivityTestRule;
9+
import androidx.test.runner.AndroidJUnit4;
10+
import androidx.test.uiautomator.UiDevice;
11+
import androidx.test.uiautomator.UiObject;
12+
import androidx.test.uiautomator.UiObjectNotFoundException;
13+
import androidx.test.uiautomator.UiSelector;
1214

1315
import org.junit.Before;
1416
import org.junit.Rule;
@@ -18,15 +20,15 @@
1820
import four.pda.ui.article.NewsActivity;
1921
import four.pda.ui.article.NewsActivity_;
2022

21-
import static android.support.test.espresso.Espresso.onView;
22-
import static android.support.test.espresso.Espresso.pressBack;
23-
import static android.support.test.espresso.action.ViewActions.click;
24-
import static android.support.test.espresso.action.ViewActions.swipeDown;
25-
import static android.support.test.espresso.action.ViewActions.swipeUp;
26-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
27-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
28-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
29-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
23+
import static androidx.test.espresso.Espresso.onView;
24+
import static androidx.test.espresso.action.ViewActions.click;
25+
import static androidx.test.espresso.action.ViewActions.pressBack;
26+
import static androidx.test.espresso.action.ViewActions.swipeDown;
27+
import static androidx.test.espresso.action.ViewActions.swipeUp;
28+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
29+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
30+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
31+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3032

3133
/**
3234
* Created by Klishin.Pavel on 08.02.2016.

‎app/src/androidTest/java/four/pda/BaseFragmentTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.LargeTest;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.filters.LargeTest;
6+
import androidx.test.rule.ActivityTestRule;
7+
import androidx.test.runner.AndroidJUnit4;
8+
import androidx.test.uiautomator.UiDevice;
9+
import androidx.test.uiautomator.UiObject;
10+
import androidx.test.uiautomator.UiObjectNotFoundException;
11+
import androidx.test.uiautomator.UiSelector;
1212

1313
import org.junit.Before;
1414
import org.junit.Rule;
@@ -18,11 +18,11 @@
1818
import four.pda.ui.article.NewsActivity;
1919
import four.pda.ui.article.NewsActivity_;
2020

21-
import static android.support.test.espresso.Espresso.onView;
22-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
23-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
24-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
25-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
21+
import static androidx.test.espresso.Espresso.onView;
22+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
23+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
24+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
25+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2626

2727
/**
2828
* Created by Klishin.Pavel on 01.02.2016.

‎app/src/androidTest/java/four/pda/GamesActivityTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.SmallTest;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.filters.SmallTest;
6+
import androidx.test.rule.ActivityTestRule;
7+
import androidx.test.runner.AndroidJUnit4;
8+
import androidx.test.uiautomator.UiDevice;
9+
import androidx.test.uiautomator.UiObject;
10+
import androidx.test.uiautomator.UiObjectNotFoundException;
11+
import androidx.test.uiautomator.UiSelector;
1212

1313
import org.junit.Before;
1414
import org.junit.Rule;
@@ -18,15 +18,15 @@
1818
import four.pda.ui.article.NewsActivity;
1919
import four.pda.ui.article.NewsActivity_;
2020

21-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
22-
import static android.support.test.espresso.Espresso.onView;
23-
import static android.support.test.espresso.Espresso.pressBack;
24-
import static android.support.test.espresso.action.ViewActions.click;
25-
import static android.support.test.espresso.action.ViewActions.swipeDown;
26-
import static android.support.test.espresso.action.ViewActions.swipeUp;
27-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
28-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
29-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
21+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
22+
import static androidx.test.espresso.Espresso.onView;
23+
import static androidx.test.espresso.Espresso.pressBack;
24+
import static androidx.test.espresso.action.ViewActions.click;
25+
import static androidx.test.espresso.action.ViewActions.swipeDown;
26+
import static androidx.test.espresso.action.ViewActions.swipeUp;
27+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
28+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
29+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3030

3131
/**
3232
* Created by Klishin.Pavel on 08.02.2016.

‎app/src/androidTest/java/four/pda/LoginActivityTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.SmallTest;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.filters.SmallTest;
6+
import androidx.test.rule.ActivityTestRule;
7+
import androidx.test.runner.AndroidJUnit4;
8+
import androidx.test.uiautomator.UiDevice;
9+
import androidx.test.uiautomator.UiObject;
10+
import androidx.test.uiautomator.UiObjectNotFoundException;
11+
import androidx.test.uiautomator.UiSelector;
1212

1313
import junit.framework.Assert;
1414

@@ -20,10 +20,10 @@
2020
import four.pda.ui.article.NewsActivity;
2121
import four.pda.ui.article.NewsActivity_;
2222

23-
import static android.support.test.espresso.Espresso.closeSoftKeyboard;
24-
import static android.support.test.espresso.Espresso.onView;
25-
import static android.support.test.espresso.action.ViewActions.click;
26-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
23+
import static androidx.test.espresso.Espresso.closeSoftKeyboard;
24+
import static androidx.test.espresso.Espresso.onView;
25+
import static androidx.test.espresso.action.ViewActions.click;
26+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2727

2828

2929
/**

‎app/src/androidTest/java/four/pda/NewsActivityTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.SmallTest;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.filters.SmallTest;
6+
import androidx.test.rule.ActivityTestRule;
7+
import androidx.test.runner.AndroidJUnit4;
8+
import androidx.test.uiautomator.UiDevice;
9+
import androidx.test.uiautomator.UiObject;
10+
import androidx.test.uiautomator.UiObjectNotFoundException;
11+
import androidx.test.uiautomator.UiSelector;
1212

1313
import org.junit.Before;
1414
import org.junit.Rule;
@@ -18,15 +18,15 @@
1818
import four.pda.ui.article.NewsActivity;
1919
import four.pda.ui.article.NewsActivity_;
2020

21-
import static android.support.test.espresso.Espresso.onView;
22-
import static android.support.test.espresso.Espresso.pressBack;
23-
import static android.support.test.espresso.action.ViewActions.click;
24-
import static android.support.test.espresso.action.ViewActions.swipeDown;
25-
import static android.support.test.espresso.action.ViewActions.swipeUp;
26-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
27-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
28-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
29-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
21+
import static androidx.test.espresso.Espresso.onView;
22+
import static androidx.test.espresso.Espresso.pressBack;
23+
import static androidx.test.espresso.action.ViewActions.click;
24+
import static androidx.test.espresso.action.ViewActions.swipeDown;
25+
import static androidx.test.espresso.action.ViewActions.swipeUp;
26+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
27+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
28+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
29+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3030

3131
/**
3232
* Created by Klishin.Pavel on 08.02.2016.

‎app/src/androidTest/java/four/pda/ReviewsActivityTest.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package four.pda;
22

33
import android.os.RemoteException;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
7-
import android.support.test.uiautomator.UiDevice;
8-
import android.support.test.uiautomator.UiObject;
9-
import android.support.test.uiautomator.UiObjectNotFoundException;
10-
import android.support.test.uiautomator.UiSelector;
11-
import android.test.suitebuilder.annotation.SmallTest;
4+
5+
import androidx.test.InstrumentationRegistry;
6+
import androidx.test.filters.SmallTest;
7+
import androidx.test.rule.ActivityTestRule;
8+
import androidx.test.runner.AndroidJUnit4;
9+
import androidx.test.uiautomator.UiDevice;
10+
import androidx.test.uiautomator.UiObject;
11+
import androidx.test.uiautomator.UiObjectNotFoundException;
12+
import androidx.test.uiautomator.UiSelector;
1213

1314
import org.junit.Before;
1415
import org.junit.Rule;
@@ -18,15 +19,15 @@
1819
import four.pda.ui.article.NewsActivity;
1920
import four.pda.ui.article.NewsActivity_;
2021

21-
import static android.support.test.espresso.Espresso.onView;
22-
import static android.support.test.espresso.Espresso.pressBack;
23-
import static android.support.test.espresso.action.ViewActions.click;
24-
import static android.support.test.espresso.action.ViewActions.swipeDown;
25-
import static android.support.test.espresso.action.ViewActions.swipeUp;
26-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
27-
import static android.support.test.espresso.matcher.ViewMatchers.isClickable;
28-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
29-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
22+
import static androidx.test.espresso.Espresso.onView;
23+
import static androidx.test.espresso.action.ViewActions.click;
24+
import static androidx.test.espresso.action.ViewActions.pressBack;
25+
import static androidx.test.espresso.action.ViewActions.swipeDown;
26+
import static androidx.test.espresso.action.ViewActions.swipeUp;
27+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
28+
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
29+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
30+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
3031

3132
/**
3233
* Created by Klishin.Pavel on 08.02.2016.

0 commit comments

Comments
 (0)