Upgrade messaging when iid updates to 20.1.0+

* Also updated OneSignal-Android-SDK version so tests pass
OneSignal · Apr 30, 2020 · a6422e8 · a6422e8 · mikechoch · Apr 30, 2020
1 parent 6f6f915
commit a6422e8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy b/src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy
@@ -192,6 +192,21 @@ class GradleProjectPlugin implements Plugin<Project> {
             ],
             '20.0.0': [
                 'com.google.firebase:firebase-messaging': '20.0.0'
+            ],
+            '20.1.0': [
+                'com.google.firebase:firebase-messaging': '20.1.1'
+            ],
+            '20.1.1': [
+                'com.google.firebase:firebase-messaging': '20.1.1'
+            ],
+            '20.1.2': [
+                'com.google.firebase:firebase-messaging': '20.1.1'
+            ],
+            '20.1.4': [
+                'com.google.firebase:firebase-messaging': '20.1.4'
+            ],
+            '20.1.5': [
+                'com.google.firebase:firebase-messaging': '20.1.4'
             ]
         ],
         'com.google.android.gms:play-services-measurement-base': [

diff --git a/src/test/groovy/com/onesignal/androidsdk/MainTest.groovy b/src/test/groovy/com/onesignal/androidsdk/MainTest.groovy
@@ -27,7 +27,7 @@ class MainTest extends Specification {
 
         then:
         results.each {
-            assert it.value.contains('com.onesignal:OneSignal:[3.8.3, 3.99.99] -> 3.12.6')
+            assert it.value.contains('com.onesignal:OneSignal:[3.8.3, 3.99.99] -> 3.13.0')
         }
     }
 
@@ -947,6 +947,25 @@ class MainTest extends Specification {
         }
     }
 
+    def 'when firebase-iid:20.1.6 ensure firebase-messaging:20.1.4'() {
+        def compileLines = """\
+            compile 'com.google.firebase:firebase-messaging:20.0.0'
+            compile 'com.google.firebase:firebase-iid:20.1.6'
+        """
+
+        when:
+        def results = runGradleProject([
+            skipGradleVersion: GRADLE_OLDEST_VERSION,
+            compileLines : compileLines
+        ])
+
+        then:
+        assert results // Asserting existence and contains 1+ entries
+        results.each {
+            assert it.value.contains('com.google.firebase:firebase-messaging:20.0.0 -> 20.1.4')
+        }
+    }
+
     def 'when firebase-core:16.0.9 ensure firebase-messaging:17.6.0'() {
         def compileLines = """\
             compile 'com.google.firebase:firebase-messaging:17.0.0'