Skip to content

Commit 94b08e4

Browse files
authored
Merge branch 'master' into master
2 parents acfa3bf + c09b494 commit 94b08e4

File tree

8 files changed

+129
-5403
lines changed

8 files changed

+129
-5403
lines changed

.npmignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,7 @@ react-native-notifications.iml
5959
local.properties
6060

6161
# Example app
62-
example
62+
example
63+
64+
# Git
65+
.git

android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
buildscript {
22
repositories {
3+
google()
34
jcenter()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.1.3'
7+
classpath 'com.android.tools.build:gradle:3.2.0'
78
}
89
}
910

1011
allprojects {
1112
repositories {
13+
google()
1214
jcenter()
1315
}
1416
}

android/react-native-push-notification.iml

Lines changed: 118 additions & 64 deletions
Large diffs are not rendered by default.

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.content.Intent;
99
import android.content.IntentFilter;
1010
import android.os.Bundle;
11-
import android.support.v4.app.NotificationManagerCompat;
11+
import androidx.core.app.NotificationManagerCompat;
1212

1313
import com.dieam.reactnativepushnotification.helpers.ApplicationBadgeHelper;
1414
import com.facebook.react.bridge.ActivityEventListener;

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationAttributes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.dieam.reactnativepushnotification.modules;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55
import android.util.Log;
66

77
import com.facebook.react.bridge.ReadableMap;

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.content.pm.ApplicationInfo;
55
import android.content.pm.PackageManager;
6-
import android.support.v4.content.res.ResourcesCompat;
6+
import androidx.core.content.res.ResourcesCompat;
77
import android.os.Bundle;
88
import android.util.Log;
99

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import android.net.Uri;
2020
import android.os.Build;
2121
import android.os.Bundle;
22-
import android.support.v4.app.NotificationCompat;
22+
import androidx.core.app.NotificationCompat;
2323
import android.util.Log;
2424

2525
import com.facebook.react.bridge.ReadableMap;

example/yarn.lock

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

0 commit comments

Comments
 (0)