Skip to content

Commit 2c78d41

Browse files
author
Rodrigo Gomez Palacio
authored
Merge pull request #1044 from OneSignal/major-release
Major release version 4.0.0
2 parents ebcadbd + 89190c1 commit 2c78d41

File tree

106 files changed

+7337
-6327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+7337
-6327
lines changed

.gitignore

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ examples/CocoapodsDemo/ios/CocoapodsDemo.xcodeproj/xcuserdata
1515
examples/CocoapodsDemo/ios/CocoapodsDemo.xcworkspace/xcshareddata
1616
examples/CocoapodsDemo/ios/CocoapodsDemo.xcworkspace/xcuserdata
1717
examples/CocoapodsDemo/ios/Pods/Pods.xcodeproj/xcuserdata
18-
examples/RNOneSignal/android/app/build
19-
examples/RNOneSignal/android/.gradle
20-
examples/RNOneSignal/android/.idea
21-
examples/RNOneSignal/android/build
22-
examples/RNOneSignal/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcshareddata
23-
examples/RNOneSignal/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcuserdata
24-
examples/RNOneSignal/ios/RNOneSignal.xcodeproj/xcuserdata
25-
examples/RNOneSignal/ios/RNOneSignal.xcworkspace/xcshareddata
26-
examples/RNOneSignal/ios/RNOneSignal.xcworkspace/xcuserdata
18+
examples/RNOneSignalTS/android/app/build
19+
examples/RNOneSignalTS/android/app/debug.keystore
20+
examples/RNOneSignalTS/android/.gradle
21+
examples/RNOneSignalTS/android/.idea
22+
examples/RNOneSignalTS/android/build
23+
examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcshareddata
24+
examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcuserdata
25+
examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/xcuserdata
26+
examples/RNOneSignalTS/ios/RNOneSignal.xcworkspace/xcshareddata
27+
examples/RNOneSignalTS/ios/RNOneSignal.xcworkspace/xcuserdata
2728
ios/RCTOneSignal.xcodeproj/project.xcworkspace/xcshareddata
2829
examples/RNOneSignal/ios/Pods/Pods.xcodeproj/xcuserdata
2930
android/.idea

android/build.gradle

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,11 @@ dependencies {
2424

2525
// api is used instead of implementation so the parent :app project can access any of the OneSignal Java
2626
// classes if needed. Such as com.onesignal.NotificationExtenderService
27-
api 'com.onesignal:OneSignal:3.15.6'
27+
api 'com.onesignal:OneSignal:4.1.0'
2828

2929
testImplementation 'junit:junit:4.12'
3030
}
3131

32-
// Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete
33-
// The OneSignal app id should be set in your JS code.
34-
// Google project number / FCM Sender ID will be pulled in from the OneSignal dashbaord
35-
class DefaultManifestPlaceHolders {
36-
static final MANIFEST_PLACEHOLDERS_DEFAULTS = [
37-
onesignal_app_id: '',
38-
onesignal_google_project_number: 'REMOTE'
39-
]
40-
41-
static void addManifestToAppProject(Project proj) {
42-
def androidApp = proj.android
43-
MANIFEST_PLACEHOLDERS_DEFAULTS.each { defKey, defValue ->
44-
if (!androidApp.defaultConfig.manifestPlaceholders.containsKey(defKey)) {
45-
androidApp.defaultConfig.manifestPlaceholders[defKey] = defValue
46-
47-
androidApp.buildTypes.each { buildType ->
48-
if (!buildType.manifestPlaceholders.containsKey(defKey))
49-
buildType.manifestPlaceholders[defKey] = defValue
50-
}
51-
}
52-
}
53-
}
54-
}
55-
56-
rootProject.childProjects.each { projName, proj ->
57-
if (projName != 'app' && projName != 'react-native-onesignal')
58-
return
59-
60-
if (proj.hasProperty('android')) {
61-
DefaultManifestPlaceHolders.addManifestToAppProject(proj)
62-
return
63-
}
64-
65-
proj.afterEvaluate {
66-
DefaultManifestPlaceHolders.addManifestToAppProject(proj)
67-
}
68-
}
69-
70-
7132
// Add the following to the top (Line 1) of your app/build.gradle if you run into any issues with duplicate classes.
7233
// Such as the following error
7334
// Error: more than one library with package name 'com.google.android.gms.license'

android/src/main/java/com/geektime/rnonesignalandroid/NotificationNotDisplayingExtender.java

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

0 commit comments

Comments
 (0)