Skip to content

Commit

Permalink
Technical: Update Android Gradle Plugin to 8.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanniktech
vanniktech committed Mar 5, 2025
1 parent 725c022 commit 7a52a11
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 31 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.9.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:2.0.0'
classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.24.0'
Expand Down
10 changes: 5 additions & 5 deletions rxpermission/src/main/java/com/vanniktech/rxpermission/RealRxPermission.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.vanniktech.rxpermission;

import android.annotation.TargetApi;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.ChecksSdkIntAtLeast;
import androidx.annotation.RequiresApi;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.ObservableTransformer;
Expand Down Expand Up @@ -93,7 +93,7 @@ public static RealRxPermission getInstance(final Context context) {
};
}

@NonNull @CheckReturnValue @SuppressWarnings("checkstyle:overloadmethodsdeclarationorder") Observable<Permission> request(final Observable<?> trigger, @NonNull final String... permissions) {
@NonNull @CheckReturnValue Observable<Permission> request(final Observable<?> trigger, @NonNull final String... permissions) {
return Observable.merge(trigger, pending(permissions))
.flatMap(new Function<Object, Observable<Permission>>() {
@Override @NonNull @CheckReturnValue public Observable<Permission> apply(final Object o) {
Expand All @@ -112,7 +112,7 @@ public static RealRxPermission getInstance(final Context context) {
return Observable.just(TRIGGER);
}

@NonNull @CheckReturnValue @TargetApi(M) Observable<Permission> requestOnM(@NonNull final String... permissions) {
@NonNull @CheckReturnValue Observable<Permission> requestOnM(@NonNull final String... permissions) {
final List<Observable<Permission>> list = new ArrayList<>(permissions.length);
final List<String> unrequestedPermissions = new ArrayList<>();

Expand Down Expand Up @@ -164,11 +164,11 @@ public static RealRxPermission getInstance(final Context context) {
return isMarshmallow() && isRevokedOnM(permission);
}

@TargetApi(M) private boolean isGrantedOnM(final String permission) {
@RequiresApi(M) private boolean isGrantedOnM(final String permission) {
return application.checkSelfPermission(permission) == PERMISSION_GRANTED;
}

@TargetApi(M) private boolean isRevokedOnM(final String permission) {
@RequiresApi(M) private boolean isRevokedOnM(final String permission) {
return application.getPackageManager().isPermissionRevokedByPolicy(permission, application.getPackageName());
}

Expand Down
6 changes: 2 additions & 4 deletions rxpermission/src/main/java/com/vanniktech/rxpermission/ShadowActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.vanniktech.rxpermission;

import android.annotation.TargetApi;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import io.reactivex.annotations.NonNull;

import static android.os.Build.VERSION_CODES.M;

@TargetApi(M) public final class ShadowActivity extends Activity {
@SuppressLint("NewApi") public final class ShadowActivity extends Activity {
private static final String ARG_PERMISSIONS = "permissions";
private static final int REQUEST_CODE = 42;

Expand Down
41 changes: 20 additions & 21 deletions rxpermission/src/test/java/com/vanniktech/rxpermission/RealRxPermissionTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vanniktech.rxpermission;

import android.annotation.TargetApi;
import android.annotation.SuppressLint;
import android.app.Application;
import android.content.pm.PackageManager;
import io.reactivex.observers.TestObserver;
Expand All @@ -17,7 +17,6 @@
import static android.Manifest.permission.READ_PHONE_STATE;
import static android.content.pm.PackageManager.PERMISSION_DENIED;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Build.VERSION_CODES.M;
import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
Expand All @@ -28,7 +27,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.quality.Strictness.WARN;

@SuppressWarnings("CheckResult") public class RealRxPermissionTest {
@SuppressWarnings("CheckResult") @SuppressLint("NewApi") public class RealRxPermissionTest {
@Rule public final MockitoRule mockitoRule = MockitoJUnit.rule().strictness(WARN);

private static final boolean[] FALSE_ARRAY = { false };
Expand Down Expand Up @@ -65,7 +64,7 @@ private static int[] permissionDenied() {
.assertResult(Permission.granted(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestGranted() {
@Test public void requestGranted() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.request(READ_PHONE_STATE)
Expand All @@ -75,7 +74,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.granted(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestDeniedFirstTime() {
@Test public void requestDeniedFirstTime() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.request(READ_PHONE_STATE)
Expand All @@ -85,7 +84,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.denied(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestDeniedAnyOtherTime() {
@Test public void requestDeniedAnyOtherTime() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.request(READ_PHONE_STATE)
Expand All @@ -95,7 +94,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.denied(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestDeniedNotShown() {
@Test public void requestDeniedNotShown() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.request(READ_PHONE_STATE)
Expand All @@ -105,7 +104,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.deniedNotShown(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestRevoked() {
@Test public void requestRevoked() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);
doReturn(true).when(rxPermission).isRevokedByPolicy(READ_PHONE_STATE);

Expand All @@ -122,7 +121,7 @@ private static int[] permissionDenied() {
.assertResult(Permission.granted(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachGranted() {
@Test public void requestEachGranted() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.requestEach(READ_PHONE_STATE)
Expand All @@ -132,7 +131,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.granted(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachDeniedFirstTime() {
@Test public void requestEachDeniedFirstTime() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.requestEach(READ_PHONE_STATE)
Expand All @@ -142,7 +141,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.denied(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachDeniedAnyOtherTime() {
@Test public void requestEachDeniedAnyOtherTime() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.requestEach(READ_PHONE_STATE)
Expand All @@ -152,7 +151,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.denied(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachDeniedNotShown() {
@Test public void requestEachDeniedNotShown() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);

final TestObserver<Permission> o = rxPermission.requestEach(READ_PHONE_STATE)
Expand All @@ -162,7 +161,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.deniedNotShown(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachRevoked() {
@Test public void requestEachRevoked() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);
doReturn(true).when(rxPermission).isRevokedByPolicy(READ_PHONE_STATE);

Expand All @@ -171,7 +170,7 @@ private static int[] permissionDenied() {
.assertResult(Permission.revokedByPolicy(READ_PHONE_STATE));
}

@Test @TargetApi(M) public void requestEachSeveralPermissionsGranted() {
@Test public void requestEachSeveralPermissionsGranted() {
final String[] permissions = { READ_PHONE_STATE, CAMERA };
doReturn(false).when(rxPermission).isGranted(anyString());
final int[] result = { PERMISSION_GRANTED, PERMISSION_GRANTED };
Expand All @@ -184,7 +183,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.granted(READ_PHONE_STATE), Permission.granted(CAMERA));
}

@Test @TargetApi(M) public void requestEachSeveralPermissionsOneAlreadyGranted() {
@Test public void requestEachSeveralPermissionsOneAlreadyGranted() {
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);
doReturn(true).when(rxPermission).isGranted(CAMERA);

Expand All @@ -198,7 +197,7 @@ private static int[] permissionDenied() {
assertThat(requestedPermissions.getValue()).containsExactly(READ_PHONE_STATE);
}

@Test @TargetApi(M) public void requestEachSeveralPermissionsOneDenied() {
@Test public void requestEachSeveralPermissionsOneDenied() {
final String[] permissions = { READ_PHONE_STATE, CAMERA };
doReturn(false).when(rxPermission).isGranted(anyString());
final int[] result = { PERMISSION_GRANTED, PERMISSION_DENIED };
Expand All @@ -211,7 +210,7 @@ private static int[] permissionDenied() {
o.assertResult(Permission.granted(READ_PHONE_STATE), Permission.deniedNotShown(CAMERA));
}

@Test @TargetApi(M) public void requestEachSeveralPermissionsOneRevoked() {
@Test public void requestEachSeveralPermissionsOneRevoked() {
final String[] permissions = { READ_PHONE_STATE, CAMERA };
doReturn(false).when(rxPermission).isGranted(READ_PHONE_STATE);
doReturn(false).when(rxPermission).isGranted(CAMERA);
Expand All @@ -231,14 +230,14 @@ private static int[] permissionDenied() {
assertThat(rxPermission.isGranted("p")).isTrue();
}

@Test @TargetApi(M) public void isGrantedGranted() {
@Test public void isGrantedGranted() {
doReturn(true).when(rxPermission).isMarshmallow();
doReturn(PERMISSION_GRANTED).when(context).checkSelfPermission("p");

assertThat(rxPermission.isGranted("p")).isTrue();
}

@Test @TargetApi(M) public void isGrantedDenied() {
@Test public void isGrantedDenied() {
doReturn(true).when(rxPermission).isMarshmallow();
doReturn(PERMISSION_DENIED).when(context).checkSelfPermission("p");

Expand All @@ -251,7 +250,7 @@ private static int[] permissionDenied() {
assertThat(rxPermission.isRevokedByPolicy("p")).isFalse();
}

@Test @TargetApi(M) public void isRevokedTrue() {
@Test public void isRevokedTrue() {
doReturn(true).when(rxPermission).isMarshmallow();
doReturn(pm).when(context).getPackageManager();
doReturn("Test1234").when(context).getPackageName();
Expand All @@ -260,7 +259,7 @@ private static int[] permissionDenied() {
assertThat(rxPermission.isRevokedByPolicy("p")).isTrue();
}

@Test @TargetApi(M) public void isGrantedFalse() {
@Test public void isGrantedFalse() {
doReturn(true).when(rxPermission).isMarshmallow();
doReturn(pm).when(context).getPackageManager();
doReturn("Test1234").when(context).getPackageName();
Expand Down

0 comments on commit 7a52a11

Please sign in to comment.