From 21a08b3b6de0ed6b81d98af367ed00b1e1cb8070 Mon Sep 17 00:00:00 2001
From: Josh Kasten <josh@onesignal.com>
Date: Sat, 10 Oct 2020 17:09:25 -0700
Subject: [PATCH 1/2] Upgraded alignments  on firebase libraries

* firebase-iid:20.2.2 sets a min version of firebase-messaging:20.2.2
* play-services-basement:17.1.0 sets a min version of firebase-messaging:19.0.0
* These version were observed by ensuring no proguard errors of missing class / method definitions
---
 .../androidsdk/GradleProjectPlugin.groovy         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy b/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
index a6bcea2..76feccf 100644
--- a/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
+++ b/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
@@ -166,7 +166,8 @@ class GradleProjectPlugin implements Plugin<Project> {
         'com.google.firebase:firebase-core': [
             '16.0.0': [
                 'com.google.firebase:firebase-messaging': '17.0.0'
-            ]
+            ],
+            // Tested up to firebase-core:17.5.1
         ],
         'com.google.firebase:firebase-common': [
             // Tested firebase-common:17.1.0 back to firebase-iid:10.2.1
@@ -218,7 +219,11 @@ class GradleProjectPlugin implements Plugin<Project> {
             ],
             '20.1.5': [
                 'com.google.firebase:firebase-messaging': '20.1.4'
-            ]
+            ],
+            '20.2.2': [
+                'com.google.firebase:firebase-messaging': '20.2.2'
+            ],
+            // Tested up to firebase-iid:20.3.0
         ],
         'com.google.android.gms:play-services-measurement-base': [
             '15.0.4': [
@@ -231,7 +236,11 @@ class GradleProjectPlugin implements Plugin<Project> {
             ],
             '17.0.0': [
                 'com.google.android.gms:play-services-base': '17.0.0'
-            ]
+            ],
+            '17.1.0': [
+                'com.google.firebase:firebase-messaging': '19.0.0'
+            ],
+            // Tested up to play-services-basement:17.4.0
         ]
     ]
 

From 31c4dbd1a7c773169d68c67d44031bfb9857920e Mon Sep 17 00:00:00 2001
From: Josh Kasten <josh@onesignal.com>
Date: Sat, 10 Oct 2020 17:23:27 -0700
Subject: [PATCH 2/2] play-services-base upgrades play-services-basement

* Set a min version of play-services-base:16.0.1 when play-services-basement:16.0.1 is used
* Fixes #132
---
 .../groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy b/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
index 76feccf..3fc86dd 100644
--- a/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
+++ b/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
@@ -232,7 +232,8 @@ class GradleProjectPlugin implements Plugin<Project> {
         ],
         'com.google.android.gms:play-services-basement': [
             '16.0.1': [
-                'com.google.firebase:firebase-messaging': '17.3.3'
+                'com.google.firebase:firebase-messaging': '17.3.3',
+                'com.google.android.gms:play-services-base': '16.0.1',
             ],
             '17.0.0': [
                 'com.google.android.gms:play-services-base': '17.0.0'