Merge pull request #1044 from OneSignal/major-release

Major release version 4.0.0

.gitignore

@@ -15,15 +15,16 @@ examples/CocoapodsDemo/ios/CocoapodsDemo.xcodeproj/xcuserdata
 examples/CocoapodsDemo/ios/CocoapodsDemo.xcworkspace/xcshareddata
 examples/CocoapodsDemo/ios/CocoapodsDemo.xcworkspace/xcuserdata
 examples/CocoapodsDemo/ios/Pods/Pods.xcodeproj/xcuserdata
-examples/RNOneSignal/android/app/build
-examples/RNOneSignal/android/.gradle
-examples/RNOneSignal/android/.idea
-examples/RNOneSignal/android/build
-examples/RNOneSignal/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcshareddata
-examples/RNOneSignal/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcuserdata
-examples/RNOneSignal/ios/RNOneSignal.xcodeproj/xcuserdata
-examples/RNOneSignal/ios/RNOneSignal.xcworkspace/xcshareddata
-examples/RNOneSignal/ios/RNOneSignal.xcworkspace/xcuserdata
+examples/RNOneSignalTS/android/app/build
+examples/RNOneSignalTS/android/app/debug.keystore
+examples/RNOneSignalTS/android/.gradle
+examples/RNOneSignalTS/android/.idea
+examples/RNOneSignalTS/android/build
+examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcshareddata
+examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/project.xcworkspace/xcuserdata
+examples/RNOneSignalTS/ios/RNOneSignal.xcodeproj/xcuserdata
+examples/RNOneSignalTS/ios/RNOneSignal.xcworkspace/xcshareddata
+examples/RNOneSignalTS/ios/RNOneSignal.xcworkspace/xcuserdata
 ios/RCTOneSignal.xcodeproj/project.xcworkspace/xcshareddata
 examples/RNOneSignal/ios/Pods/Pods.xcodeproj/xcuserdata
 android/.idea

android/build.gradle

@@ -24,50 +24,11 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:3.15.6'
+    api 'com.onesignal:OneSignal:4.1.0'
 
     testImplementation 'junit:junit:4.12'
 }
 
-// Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete
-// The OneSignal app id should be set in your JS code.
-// Google project number / FCM Sender ID will be pulled in from the OneSignal dashbaord
-class DefaultManifestPlaceHolders {
-    static final MANIFEST_PLACEHOLDERS_DEFAULTS = [
-        onesignal_app_id: '',
-        onesignal_google_project_number: 'REMOTE'
-    ]
-
-    static void addManifestToAppProject(Project proj) {
-        def androidApp = proj.android
-        MANIFEST_PLACEHOLDERS_DEFAULTS.each { defKey, defValue ->
-            if (!androidApp.defaultConfig.manifestPlaceholders.containsKey(defKey)) {
-                androidApp.defaultConfig.manifestPlaceholders[defKey] = defValue
-
-                androidApp.buildTypes.each { buildType ->
-                    if (!buildType.manifestPlaceholders.containsKey(defKey))
-                        buildType.manifestPlaceholders[defKey] = defValue
-                }
-            }
-        }
-    }
-}
-
-rootProject.childProjects.each { projName, proj ->
-    if (projName != 'app' && projName != 'react-native-onesignal')
-        return
-
-    if (proj.hasProperty('android')) {
-        DefaultManifestPlaceHolders.addManifestToAppProject(proj)
-        return
-    }
-
-    proj.afterEvaluate {
-        DefaultManifestPlaceHolders.addManifestToAppProject(proj)
-    }
-}
-
-
 // Add the following to the top (Line 1) of your app/build.gradle if you run into any issues with duplicate classes.
 // Such as the following error
 //   Error: more than one library with package name 'com.google.android.gms.license'