Merge pull request #146 from OneSignal/fix/agp_version_detection

AGP detection with Version.ANDROID_GRADLE_PLUGIN_VERSION

Author: jkasten2

src/main/groovy/com/onesignal/androidsdk/GradleProjectPlugin.groovy

@@ -350,15 +350,74 @@ class GradleProjectPlugin implements Plugin<Project> {
     }
 
     static String getAGPVersion(Plugin plugin) {
+        def pluginVersion = getAGPVersionFromAndroidClass()
+        if (pluginVersion)
+            return pluginVersion
+
+       pluginVersion = getAGPVersionFromJarManifest(plugin)
+        if (pluginVersion)
+            return pluginVersion
+
+        getAGPVersionByGradleVersion()
+    }
+
+    static String getAGPVersionFromAndroidClass() {
+        try {
+            return com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+        } catch(NoClassDefFoundError ignore) {
+            // Class may not be loaded, pre-AGP 3.0.0 version, or AGP made a breaking change
+            if (project)
+                project.logger.info("getAGPVersionFromAndroidVersionClass: com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION is not defined")
+        }
+        null
+    }
+
+    // Only use as a fallback, use getAGPVersionFromAndroidClass() instead if it's available
+    static String getAGPVersionFromJarManifest(Plugin plugin) {
         try {
-            def cl = plugin.class.classLoader as URLClassLoader
-            def inputStream = cl.findResource('META-INF/MANIFEST.MF').openStream()
+            def classLoader = plugin.class.classLoader as URLClassLoader
+            def inputStream = classLoader.findResource('META-INF/MANIFEST.MF').openStream()
             def manifest = new Manifest(inputStream)
-            return manifest.mainAttributes.getValue('Plugin-Version')
-        } catch (ignore) {}
+            // In some cases 'Plugin-Version' will be "unspecified" as a value.
+            //   - Seen this value with some Cordova projects for an unknown reason.
+            def pluginVersionManifestValue = manifest.mainAttributes.getValue('Plugin-Version')
+            if (isValidVersionNumber(pluginVersionManifestValue))
+                return pluginVersionManifestValue
+            if (project)
+                project.logger.warn("Error 'Plugin-Version' of '$pluginVersionManifestValue' for '$plugin' is not a valid version number")
+        } catch (ignore) {
+            if (project)
+                project.logger.warn("Error reading 'META-INF/MANIFEST.MF' for '$plugin'")
+        }
         null
     }
 
+    // Only use as a fallback, use getAGPVersionFromAndroidClass() instead if it's available
+    static String getAGPVersionByGradleVersion() {
+        if (!project)
+            return null
+
+        // Making assumption that if they are using an older version of Gradle they are using an older version of AGP
+        if (compareVersions(project.gradle.gradleVersion, '4.1.0') == -1)
+            return '2.99.99'
+        else
+            return null
+
+        // List of min Gradle versions for each APG version
+        // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+
+        // NOTE: Attempted to use the following to detect AGP 2.2.3 but in all attempts below the "Version" class was not found.
+        // com.android.build.gradle.internal.Version.ANDROID_GRADLE_PLUGIN_VERSION
+        // com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION
+        // com.android.builder.Version.getAndroidGradlePluginVersion()
+    }
+
+    static boolean isValidVersionNumber(String version) {
+        def versionParser = new VersionParser()
+        def parsedVersion = versionParser.transform(version)
+        parsedVersion.numericParts.length > 0 && parsedVersion.numericParts[0] != null
+    }
+
     static void warnOnce(WarningType type, String msg) {
         if (shownWarnings[type])
             return

src/test/groovy/com/onesignal/androidsdk/MainTest.groovy

@@ -1295,11 +1295,11 @@ class MainTest extends Specification {
         when:
         def results = runGradleProject([
             compileLines: """
-                compile 'com.android.support:appcompat-v7:26.0.0'
-                compile 'com.google.firebase:firebase-messaging:15.0.2'
-                compile 'com.google.firebase:firebase-core:16.0.0'
+    implementation 'com.google.android.gms:play-services-base:15.0.1'
+    implementation 'com.google.android.gms:play-services-basement:17.4.0'
             """,
-            skipGradleVersion: GRADLE_OLDEST_VERSION
+            skipGradleVersion: GRADLE_OLDEST_VERSION,
+            'android.useAndroidX': true,
         ])
 
         then: