Skip to content
This repository was archived by the owner on Aug 9, 2020. It is now read-only.

Commit 3d1b78f

Browse files
VictorAlbertosVictorAlbertos
authored
Merge pull request #59 from ParthPadg/androidx
migrate to AndroidX
2 parents c228703 + eccf8b9 commit 3d1b78f

27 files changed

+93
-89
lines changed

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class SampleApp extends Application {
4747
You can call `RxActivityResult.on(this).startIntent(intent)` supplying both, an `Activity` instance or a `Fragment` instance.
4848
Observe the emitted [Result](https://github.com/VictorAlbertos/RxActivityResult/blob/master/rx_activity_result/src/main/java/rx_activity_result/Result.java) item to know the resultCode and retrieve the associated data if appropriate.
4949

50-
**Limitation:**: Your fragments need to extend from `android.support.v4.app.Fragment` instead of `android.app.Fragment`, otherwise they won't be notified.
50+
**Limitation:** Your fragments need to extend from `androidx.fragment.app.Fragment` instead of `android.app.Fragment`, otherwise they won't be notified.
5151

5252

5353
```java

‎app/build.gradle‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'me.tatarka.retrolambda'
32

43
buildscript {
54
repositories {
65
mavenCentral()
76
jcenter()
87
}
9-
10-
dependencies {
11-
classpath 'me.tatarka:gradle-retrolambda:3.2.4'
12-
}
138
}
149

1510
android {
16-
compileSdkVersion 24
17-
buildToolsVersion "24.0.1"
11+
compileSdkVersion 28
1812

1913
defaultConfig {
2014
applicationId "io.victoralbertos.app"
2115
minSdkVersion 16
2216
targetSdkVersion 24
2317
versionCode 1
2418
versionName "1.0"
25-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
19+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2620
}
2721
buildTypes {
2822
release {
@@ -40,33 +34,41 @@ android {
4034
}
4135

4236
dependencies {
43-
compile fileTree(dir: 'libs', include: ['*.jar'])
44-
compile project(":rx_activity_result")
37+
implementation fileTree(dir: 'libs', include: ['*.jar'])
38+
implementation project(":rx_activity_result")
4539

46-
compile 'com.android.support:appcompat-v7:24.2.1'
47-
compile 'com.android.support:design:24.2.1'
40+
implementation('androidx.appcompat:appcompat:1.0.2') {
41+
exclude group: "androidx.legacy", module: "legacy-support-core-utils"
42+
}
43+
implementation('com.google.android.material:material:1.0.0'){
44+
exclude group: "androidx.legacy", module: "legacy-support-core-utils"
45+
}
4846

49-
testCompile 'junit:junit:4.12'
50-
androidTestCompile ("com.android.support.test:runner:0.4.1") {
51-
exclude module: 'support-annotations'
47+
testImplementation 'junit:junit:4.12'
48+
androidTestImplementation('androidx.test:runner:1.1.0') {
49+
exclude module: 'annotation'
50+
}
51+
androidTestImplementation('androidx.test:rules:1.1.0') {
52+
exclude module: 'annotation'
5253
}
53-
androidTestCompile ("com.android.support.test:rules:0.4.1") {
54-
exclude module: 'support-annotations'
54+
55+
androidTestImplementation('androidx.test.ext:junit:1.0.0') {
56+
exclude module: 'annotation'
5557
}
5658

57-
androidTestCompile ("com.android.support.test.espresso:espresso-intents:2.2.1") {
58-
exclude module: 'support-annotations'
59-
exclude module: 'support-v4'
60-
exclude module: 'support-v13'
61-
exclude module: 'recyclerview-v7'
59+
androidTestImplementation('androidx.test.espresso:espresso-intents:3.1.0') {
60+
exclude module: 'annotation'
61+
exclude module: 'legacy-support-v4'
62+
exclude module: 'legacy-support-v13'
63+
exclude module: 'recyclerview'
6264
}
6365

64-
androidTestCompile ("com.android.support.test.espresso:espresso-contrib:2.2.1") {
65-
exclude module: 'support-annotations'
66-
exclude module: 'support-v4'
67-
exclude module: 'support-v13'
68-
exclude module: 'recyclerview-v7'
66+
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
67+
exclude module: 'annotation'
68+
exclude module: 'legacy-support-v4'
69+
exclude module: 'legacy-support-v13'
70+
exclude module: 'recyclerview'
6971
}
7072

71-
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
73+
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
7274
}

‎app/src/androidTest/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
xmlns:tools="http://schemas.android.com/tools">
55
<uses-permission android:name="android.permission.SET_ANIMATION_SCALE"/>
66

7-
<uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
7+
<uses-sdk tools:overrideLibrary="androidx.test.uiautomator,android_libs.ub_uiautomator"/>
88
</manifest>

‎app/src/androidTest/java/app/ApplicationTest.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
import android.content.Context;
44
import android.graphics.Point;
55
import android.os.RemoteException;
6-
import android.support.test.InstrumentationRegistry;
7-
import android.support.test.espresso.matcher.BoundedMatcher;
8-
import android.support.test.rule.ActivityTestRule;
9-
import android.support.test.runner.AndroidJUnit4;
10-
import android.support.test.uiautomator.UiDevice;
116
import android.view.Display;
127
import android.view.View;
138
import android.view.WindowManager;
@@ -19,12 +14,17 @@
1914
import org.junit.Test;
2015
import org.junit.runner.RunWith;
2116

17+
import androidx.test.espresso.matcher.BoundedMatcher;
18+
import androidx.test.ext.junit.runners.AndroidJUnit4;
19+
import androidx.test.platform.app.InstrumentationRegistry;
20+
import androidx.test.rule.ActivityTestRule;
21+
import androidx.test.uiautomator.UiDevice;
2222
import io.victoralbertos.app.R;
2323

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.assertion.ViewAssertions.matches;
27-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
24+
import static androidx.test.espresso.Espresso.onView;
25+
import static androidx.test.espresso.action.ViewActions.click;
26+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
27+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2828

2929
@RunWith(AndroidJUnit4.class)
3030
public class ApplicationTest {
@@ -123,7 +123,9 @@ private void rotateDevice() {
123123
}
124124

125125
private void clickBottomMiddleScreen() {
126-
WindowManager wm = (WindowManager) InstrumentationRegistry.getTargetContext().getSystemService(Context.WINDOW_SERVICE);
126+
WindowManager wm = (WindowManager) InstrumentationRegistry.getInstrumentation()
127+
.getTargetContext()
128+
.getSystemService(Context.WINDOW_SERVICE);
127129
Display display = wm.getDefaultDisplay();
128130
Point size = new Point();
129131
display.getSize(size);

‎app/src/androidTest/java/app/MultiStartTest.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package app;
22

3-
import android.support.test.rule.ActivityTestRule;
4-
import android.support.test.runner.AndroidJUnit4;
5-
6-
import app.multi_start.MultiStartActivity;
73
import org.junit.Rule;
84
import org.junit.Test;
95
import org.junit.runner.RunWith;
106

7+
import androidx.test.ext.junit.runners.AndroidJUnit4;
8+
import androidx.test.rule.ActivityTestRule;
9+
import app.multi_start.MultiStartActivity;
1110
import io.victoralbertos.app.R;
1211

13-
import static android.support.test.espresso.Espresso.onView;
14-
import static android.support.test.espresso.action.ViewActions.click;
15-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
16-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
17-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
12+
import static androidx.test.espresso.Espresso.onView;
13+
import static androidx.test.espresso.action.ViewActions.click;
14+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
15+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
16+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
1817

1918
@RunWith(AndroidJUnit4.class)
2019
public class MultiStartTest {

‎app/src/androidTest/java/app/OnPreResultTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package app;
22

3-
import android.support.test.rule.ActivityTestRule;
4-
import android.support.test.runner.AndroidJUnit4;
5-
import io.victoralbertos.app.R;
63
import org.junit.Rule;
74
import org.junit.Test;
85
import org.junit.runner.RunWith;
96

10-
import static android.support.test.espresso.Espresso.onView;
11-
import static android.support.test.espresso.action.ViewActions.click;
12-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
13-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
14-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
7+
import androidx.test.ext.junit.runners.AndroidJUnit4;
8+
import androidx.test.rule.ActivityTestRule;
9+
import io.victoralbertos.app.R;
10+
11+
import static androidx.test.espresso.Espresso.onView;
12+
import static androidx.test.espresso.action.ViewActions.click;
13+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
14+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
15+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
1516

1617
@RunWith(AndroidJUnit4.class)
1718
public class OnPreResultTest {

‎app/src/main/java/app/HostActivitySampleFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import io.victoralbertos.app.R;
77

‎app/src/main/java/app/HostActivitySampleFragmentNested.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import io.victoralbertos.app.R;
77

‎app/src/main/java/app/OnPreResultActivity.java‎

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

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.View;
77
import android.widget.TextView;
88
import app.multi_start.FirstActivity;

0 commit comments

Comments
 (0)