From eb7657d7ca0247079a3d8e3a108088505b38cb8a Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 18 Aug 2017 16:30:57 -0700 Subject: [PATCH] Update all the things Signed-off-by: Alex Saveau --- .travis.yml | 5 ++-- app/build.gradle | 4 +-- build.gradle | 14 +++++----- easypermissions/build.gradle | 2 +- .../easypermissions/EasyPermissions.java | 26 +++++++++++------- gradle/wrapper/gradle-wrapper.jar | Bin 54711 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index c45673d..b2e8a66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,7 @@ android: components: - tools - platform-tools - - build-tools-25.0.3 - - android-25 - - extra-android-m2repository + - build-tools-26.0.1 + - android-26 script: ./gradlew build diff --git a/app/build.gradle b/app/build.gradle index 819f596..8f96cf5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "pub.devrel.easypermissions.sample" - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion targetSdk versionCode 1 versionName "1.0" @@ -28,5 +28,5 @@ dependencies { compile project(':easypermissions') testCompile 'junit:junit:4.12' - testCompile 'org.robolectric:robolectric:3.3.2' + testCompile 'org.robolectric:robolectric:3.4.2' } diff --git a/build.gradle b/build.gradle index 4f2c9ea..ccaabf4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { jcenter() - maven { url 'https://maven.google.com' } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha8' + classpath 'com.android.tools.build:gradle:3.0.0-beta2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { jcenter() - maven { url 'https://maven.google.com' } + google() } } @@ -35,9 +35,9 @@ ext { bintrayOrg = 'easygoogle' - support_library_version = '25.3.1' + support_library_version = '26.0.1' - buildTools = '25.0.3' - compileSdk = 25 - targetSdk = 25 + buildTools = '26.0.1' + compileSdk = 26 + targetSdk = 26 } diff --git a/easypermissions/build.gradle b/easypermissions/build.gradle index a3590d8..a7f34d6 100644 --- a/easypermissions/build.gradle +++ b/easypermissions/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion buildTools defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion targetSdk versionCode 1 versionName mavenVersion diff --git a/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java b/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java index 0a767ae..22f5f5c 100644 --- a/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java +++ b/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java @@ -89,6 +89,7 @@ public static boolean hasPermissions(Context context, @NonNull String... perms) /** * Request permissions from an Activity with standard OK/Cancel buttons. + * * @see #requestPermissions(Activity, String, int, int, int, String...) */ public static void requestPermissions( @@ -100,6 +101,7 @@ public static void requestPermissions( /** * Request permissions from a Support Fragment with standard OK/Cancel buttons. + * * @see #requestPermissions(Activity, String, int, int, int, String...) */ public static void requestPermissions( @@ -112,6 +114,7 @@ public static void requestPermissions( /** * Request permissions from a standard Fragment with standard OK/Cancel buttons. + * * @see #requestPermissions(Activity, String, int, int, int, String...) */ public static void requestPermissions( @@ -145,6 +148,7 @@ public static void requestPermissions( /** * Request permissions from a Support Fragment. + * * @see #requestPermissions(Activity, String, int, int, int, String...) */ public static void requestPermissions( @@ -302,7 +306,7 @@ public static boolean permissionPermanentlyDenied(@NonNull android.app.Fragment /** * See if some denied permission has been permanently denied. * - * @param host requesting context. + * @param host requesting context. * @param perms array of permissions. * @return true if the user has previously denied any of the {@code perms} and we should show a * rationale, false otherwise. @@ -329,11 +333,12 @@ public static boolean somePermissionDenied(@NonNull android.app.Fragment host, } /** - * Run permission callbacks on an object that requested permissions but already has them - * by simulating {@link PackageManager#PERMISSION_GRANTED}. - * @param object the object requesting permissions. + * Run permission callbacks on an object that requested permissions but already has them by + * simulating {@link PackageManager#PERMISSION_GRANTED}. + * + * @param object the object requesting permissions. * @param requestCode the permission request code. - * @param perms a list of permissions requested. + * @param perms a list of permissions requested. */ private static void notifyAlreadyHasPermissions(@NonNull Object object, int requestCode, @@ -348,8 +353,9 @@ private static void notifyAlreadyHasPermissions(@NonNull Object object, /** * Find all methods annotated with {@link AfterPermissionGranted} on a given object with the - * correc requestCode argument. - * @param object the object with annotated methods. + * correct requestCode argument. + * + * @param object the object with annotated methods. * @param requestCode the requestCode passed to the annotation. */ private static void runAnnotatedMethods(@NonNull Object object, int requestCode) { @@ -360,9 +366,9 @@ private static void runAnnotatedMethods(@NonNull Object object, int requestCode) while (clazz != null) { for (Method method : clazz.getDeclaredMethods()) { - if (method.isAnnotationPresent(AfterPermissionGranted.class)) { + AfterPermissionGranted ann = method.getAnnotation(AfterPermissionGranted.class); + if (ann != null) { // Check for annotated methods with matching request code. - AfterPermissionGranted ann = method.getAnnotation(AfterPermissionGranted.class); if (ann.value() == requestCode) { // Method must be void so that we can invoke it if (method.getParameterTypes().length > 0) { @@ -390,7 +396,7 @@ private static void runAnnotatedMethods(@NonNull Object object, int requestCode) } /** - * Determine if the project is using the AndroidAnnoations library. + * Determine if the project is using the AndroidAnnotations library. */ private static boolean isUsingAndroidAnnotations(@NonNull Object object) { if (!object.getClass().getSimpleName().endsWith("_")) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 20d957c6de865f60cf7cfdb4a2363fbf9f88a5c7..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644 GIT binary patch delta 731 zcmYk4T}YEr7{}l9sM~u{?j6%L&nAAPrUU0JOw+*}g@MypSlUA9B1R!;VAMshtBQgw zKmJLSh1IQ46oyw7w)rvl;Wmws0YJ!pk_SV;a(PoVs;*I$w-CIu(tJ8rt;QE-@SsEZy4FcUa{{0|zMVw_c@D|VjZ z7vPz+VJ+sNvjY-81q?FN6Xz7VD6Qf6L3(gm;9h)<*VBzF5?d2T$a*!4d3c^^BtuZj zj-VB%6B-(pIqQON`4VkilLg0h8oV?18vpMzM*gR9KD~#=h+rHA(h{*GAp=851S=FZ z|CApUkr&d_soJtiLY*Tqsk%O(8U#Vegw0zO z&BK7VA!(e&Iy!G3L%BB>(sGKpfQ;o5aR>LLOf)YmB#RJz8K@CuxS4fI5j(nahDs8n zDjAnoDrh1(>XPtbs%NpKs}@pV-p zOWs~63*)LDg_hX;ITj9UEvb0Sie(hV!h|9YONyefz#0p)tsGWcbv$#x9t$7ZIecf= zqT`c7DGp}yQ0p-8E0}Ba2lg*42!>JLMXGf2gf`y=I?}}DM_(lgSGdggmy@mqg)JsL z^($gKTz;GQ5h!-Dff%J8CiY zbun3nhBbwHK4$9&WECt&rZIFYy z(0MvIjN;*PsEluiWRd;qdNZXzXTbuDtd~;S7?+J>T3$AOGPYT}6C9RKX0ihmT6@LI zroK*N^%OF_;Wl@}PB*8}J7vbu2J7e?Qo^jGa}qE3dm*-?+t7uZ=(`)5MH_|!dbq-} nxQJl*7QusA&tWufYK@V({x`?$J0kP^e|