Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 67d611b

Browse files
samtsternsamtstern
authored
Migrate to AndroidX (#272)
1 parent 62ee80e commit 67d611b

32 files changed

+231
-187
lines changed

Diff for: ‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ EasyPermissions is installed by adding the following dependency to your `build.g
99

1010
```groovy
1111
dependencies {
12-
   implementation 'pub.devrel:easypermissions:2.0.1'
12+
// For developers using AndroidX in their applications
13+
   implementation 'pub.devrel:easypermissions:3.0.0'
14+
15+
// For developers using the Android Support Library
16+
implementation 'pub.devrel:easypermissions:2.0.1'
1317
}
1418
```
1519

Diff for: ‎app/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ android {
2020
}
2121

2222
dependencies {
23-
implementation "com.android.support:appcompat-v7:$support_library_version"
24-
23+
implementation 'androidx.appcompat:appcompat:1.0.2'
2524
implementation project(':easypermissions')
2625
}

Diff for: ‎app/src/main/java/pub/devrel/easypermissions/sample/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import android.Manifest;
1919
import android.content.Intent;
2020
import android.os.Bundle;
21-
import android.support.annotation.NonNull;
22-
import android.support.v7.app.AppCompatActivity;
21+
import androidx.annotation.NonNull;
22+
import androidx.appcompat.app.AppCompatActivity;
2323
import android.util.Log;
2424
import android.view.View;
2525
import android.widget.Toast;

Diff for: ‎app/src/main/java/pub/devrel/easypermissions/sample/MainFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import android.Manifest;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.v4.app.Fragment;
75
import android.util.Log;
86
import android.view.LayoutInflater;
97
import android.view.View;
@@ -12,6 +10,8 @@
1210

1311
import java.util.List;
1412

13+
import androidx.annotation.NonNull;
14+
import androidx.fragment.app.Fragment;
1515
import pub.devrel.easypermissions.AfterPermissionGranted;
1616
import pub.devrel.easypermissions.EasyPermissions;
1717

Diff for: ‎build.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.0'
1010
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1111
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.13.0'
1212
}
@@ -31,12 +31,10 @@ ext {
3131

3232
mavenGroup = 'pub.devrel'
3333
mavenArtifactId = 'easypermissions'
34-
mavenVersion = '2.0.1'
34+
mavenVersion = '3.0.0'
3535

3636
bintrayOrg = 'easygoogle'
3737

38-
support_library_version = '28.0.0'
39-
4038
compileSdk = 28
4139
targetSdk = 28
4240
}

Diff for: ‎easypermissions/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ junitJacoco {
3333
}
3434

3535
dependencies {
36-
api "com.android.support:appcompat-v7:$support_library_version"
37-
api "com.android.support:support-compat:$support_library_version"
38-
api "com.android.support:support-fragment:$support_library_version"
36+
api "androidx.appcompat:appcompat:1.0.2"
37+
api "androidx.core:core:1.0.1"
38+
api "androidx.fragment:fragment:1.0.0"
3939

4040
testImplementation 'junit:junit:4.12'
4141
testImplementation 'com.google.truth:truth:0.42'
4242
testImplementation 'org.robolectric:robolectric:4.1'
43-
testImplementation 'org.robolectric:shadows-supportv4:4.1'
43+
testImplementation 'androidx.test:core:1.1.0'
44+
testImplementation 'androidx.fragment:fragment-testing:1.1.0-alpha03'
4445
testImplementation 'org.mockito:mockito-core:2.23.4'
4546
}
4647

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
import android.content.Intent;
77
import android.os.Parcel;
88
import android.os.Parcelable;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.Nullable;
11-
import android.support.annotation.RestrictTo;
12-
import android.support.annotation.StringRes;
13-
import android.support.annotation.StyleRes;
14-
import android.support.v4.app.Fragment;
15-
import android.support.v7.app.AlertDialog;
169
import android.text.TextUtils;
1710

11+
import androidx.annotation.NonNull;
12+
import androidx.annotation.Nullable;
13+
import androidx.annotation.RestrictTo;
14+
import androidx.annotation.StringRes;
15+
import androidx.annotation.StyleRes;
16+
import androidx.appcompat.app.AlertDialog;
17+
import androidx.fragment.app.Fragment;
18+
1819
/**
1920
* Dialog to prompt the user to go to the app's settings screen and enable permissions. If the user
2021
* clicks 'OK' on the dialog, they are sent to the settings screen. The result is returned to the
@@ -119,7 +120,7 @@ public void show() {
119120
AlertDialog showDialog(DialogInterface.OnClickListener positiveListener,
120121
DialogInterface.OnClickListener negativeListener) {
121122
AlertDialog.Builder builder;
122-
if (mThemeResId > 0) {
123+
if (mThemeResId != -1) {
123124
builder = new AlertDialog.Builder(mContext, mThemeResId);
124125
} else {
125126
builder = new AlertDialog.Builder(mContext);

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import android.net.Uri;
99
import android.os.Bundle;
1010
import android.provider.Settings;
11-
import android.support.annotation.RestrictTo;
12-
import android.support.v7.app.AlertDialog;
13-
import android.support.v7.app.AppCompatActivity;
11+
import androidx.annotation.RestrictTo;
12+
import androidx.appcompat.app.AlertDialog;
13+
import androidx.appcompat.app.AppCompatActivity;
1414

1515
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
1616
public class AppSettingsDialogHolderActivity extends AppCompatActivity implements DialogInterface.OnClickListener {

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import android.content.Context;
2121
import android.content.pm.PackageManager;
2222
import android.os.Build;
23-
import android.support.annotation.NonNull;
24-
import android.support.annotation.Size;
25-
import android.support.v4.app.ActivityCompat;
26-
import android.support.v4.app.Fragment;
27-
import android.support.v4.content.ContextCompat;
23+
import androidx.annotation.NonNull;
24+
import androidx.annotation.Size;
25+
import androidx.core.app.ActivityCompat;
26+
import androidx.fragment.app.Fragment;
27+
import androidx.core.content.ContextCompat;
2828
import android.util.Log;
2929

3030
import java.lang.reflect.InvocationTargetException;

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/PermissionRequest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package pub.devrel.easypermissions;
22

33
import android.app.Activity;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
6-
import android.support.annotation.RestrictTo;
7-
import android.support.annotation.Size;
8-
import android.support.annotation.StringRes;
9-
import android.support.annotation.StyleRes;
10-
import android.support.v4.app.Fragment;
4+
import androidx.annotation.NonNull;
5+
import androidx.annotation.Nullable;
6+
import androidx.annotation.RestrictTo;
7+
import androidx.annotation.Size;
8+
import androidx.annotation.StringRes;
9+
import androidx.annotation.StyleRes;
10+
import androidx.fragment.app.Fragment;
1111

1212
import java.util.Arrays;
1313

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.app.Activity;
44
import android.app.Dialog;
55
import android.content.DialogInterface;
6-
import android.support.v4.app.Fragment;
6+
import androidx.fragment.app.Fragment;
77

88
import java.util.Arrays;
99

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.app.Dialog;
44
import android.content.Context;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.StyleRes;
8-
import android.support.v7.app.AlertDialog;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.StyleRes;
8+
import androidx.appcompat.app.AlertDialog;
99

1010
/**
1111
* Configuration for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}.

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import android.content.Context;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.RestrictTo;
11-
import android.support.annotation.StyleRes;
9+
import androidx.annotation.NonNull;
10+
import androidx.annotation.RestrictTo;
11+
import androidx.annotation.StyleRes;
1212

1313
/**
1414
* {@link DialogFragment} to display rationale for permission requests when the request comes from

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragmentCompat.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import android.app.Dialog;
44
import android.content.Context;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.RestrictTo;
8-
import android.support.annotation.StyleRes;
9-
import android.support.v4.app.FragmentManager;
10-
import android.support.v7.app.AppCompatDialogFragment;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.RestrictTo;
8+
import androidx.annotation.StyleRes;
9+
import androidx.fragment.app.FragmentManager;
10+
import androidx.appcompat.app.AppCompatDialogFragment;
1111

1212
/**
1313
* {@link AppCompatDialogFragment} to display rationale for permission requests when the request

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/ActivityPermissionHelper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.app.Fragment;
55
import android.app.FragmentManager;
66
import android.content.Context;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.StyleRes;
9-
import android.support.v4.app.ActivityCompat;
7+
import androidx.annotation.NonNull;
8+
import androidx.annotation.StyleRes;
9+
import androidx.core.app.ActivityCompat;
1010
import android.util.Log;
1111

1212
import pub.devrel.easypermissions.RationaleDialogFragment;

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/AppCompatActivityPermissionsHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package pub.devrel.easypermissions.helper;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.v4.app.ActivityCompat;
6-
import android.support.v4.app.FragmentManager;
7-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.NonNull;
5+
import androidx.core.app.ActivityCompat;
6+
import androidx.fragment.app.FragmentManager;
7+
import androidx.appcompat.app.AppCompatActivity;
88

99
/**
1010
* Permissions helper for {@link AppCompatActivity}.

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/BaseSupportPermissionsHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package pub.devrel.easypermissions.helper;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.StyleRes;
5-
import android.support.v4.app.Fragment;
6-
import android.support.v4.app.FragmentManager;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.StyleRes;
5+
import androidx.fragment.app.Fragment;
6+
import androidx.fragment.app.FragmentManager;
77
import android.util.Log;
88

99
import pub.devrel.easypermissions.RationaleDialogFragmentCompat;

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/LowApiPermissionsHelper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.app.Activity;
44
import android.content.Context;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.StyleRes;
7-
import android.support.v4.app.Fragment;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.StyleRes;
7+
import androidx.fragment.app.Fragment;
88

99
/**
1010
* Permissions helper for apps built against API < 23, which do not need runtime permissions.

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/PermissionHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.os.Build;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.StyleRes;
8-
import android.support.v4.app.Fragment;
9-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.StyleRes;
8+
import androidx.fragment.app.Fragment;
9+
import androidx.appcompat.app.AppCompatActivity;
1010

1111
import java.util.List;
1212

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/SupportFragmentPermissionHelper.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package pub.devrel.easypermissions.helper;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.v4.app.Fragment;
6-
import android.support.v4.app.FragmentActivity;
7-
import android.support.v4.app.FragmentManager;
4+
import androidx.annotation.NonNull;
5+
import androidx.fragment.app.Fragment;
6+
import androidx.fragment.app.FragmentManager;
87

98
/**
109
* Permissions helper for {@link Fragment} from the support library.

Diff for: ‎easypermissions/src/main/java/pub/devrel/easypermissions/helper/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
22
package pub.devrel.easypermissions.helper;
33

4-
import android.support.annotation.RestrictTo;
4+
import androidx.annotation.RestrictTo;

0 commit comments

Comments
 (0)