From c386f2d1d09951a5fcd62b94eb2c392cc40a5b8b Mon Sep 17 00:00:00 2001
From: "Christopher J. Brody" <chris.brody@gmail.com>
Date: Mon, 21 Jan 2019 09:34:02 -0500
Subject: [PATCH 1/2] Quick fix to use SDK versions from AndroidManifest

---
 .../cordova/lib/builders/ProjectBuilder.js    | 47 ++++++++++++--
 bin/templates/project/app/build.gradle        | 10 +++
 bin/templates/project/build.gradle            |  6 +-
 spec/unit/builders/ProjectBuilder.spec.js     | 64 ++++++++++++++++---
 4 files changed, 110 insertions(+), 17 deletions(-)

diff --git a/bin/templates/cordova/lib/builders/ProjectBuilder.js b/bin/templates/cordova/lib/builders/ProjectBuilder.js
index c5ad00d34a..dd1e58ebd7 100644
--- a/bin/templates/cordova/lib/builders/ProjectBuilder.js
+++ b/bin/templates/cordova/lib/builders/ProjectBuilder.js
@@ -89,7 +89,7 @@ class ProjectBuilder {
         };
     }
 
-    extractRealProjectNameFromManifest () {
+    getAndroidManifestInfo () {
         var manifestPath = path.join(this.root, 'app', 'src', 'main', 'AndroidManifest.xml');
         var manifestData = fs.readFileSync(manifestPath, 'utf8');
         var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData);
@@ -97,9 +97,21 @@ class ProjectBuilder {
             throw new CordovaError('Could not find package name in ' + manifestPath);
         }
 
-        var packageName = m[1];
-        var lastDotIndex = packageName.lastIndexOf('.');
-        return packageName.substring(lastDotIndex + 1);
+        const m2 = /<uses-sdk[\s\S]*?android:minSdkVersion\s*=\s*"(.*?)"/i.exec(manifestData);
+        if (!m2) {
+            throw new CordovaError('Could not find android:minSdkVersion in ' + manifestPath);
+        }
+
+        const m3 = /<uses-sdk[\s\S]*?android:targetSdkVersion\s*=\s*"(.*?)"/i.exec(manifestData);
+        if (!m3) {
+            throw new CordovaError('Could not find android:targetSdkVersion in ' + manifestPath);
+        }
+
+        return {
+            packageName: m[1],
+            minSdkVersion: parseInt(m2[1], 10),
+            targetSdkVersion: parseInt(m3[1], 10)
+        };
     }
 
     // Makes the project buildable, minus the gradle wrapper.
@@ -128,7 +140,13 @@ class ProjectBuilder {
                 checkAndCopy(subProjects[i], this.root);
             }
         }
-        var name = this.extractRealProjectNameFromManifest();
+
+        const androidManifestInfo = this.getAndroidManifestInfo();
+
+        const packageName = androidManifestInfo.packageName;
+        const lastDotIndex = packageName.lastIndexOf('.');
+        const name = packageName.substring(lastDotIndex + 1);
+
         // Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
         var settingsGradlePaths = subProjects.map(function (p) {
             var realDir = p.replace(/[/\\]/g, ':');
@@ -144,7 +162,24 @@ class ProjectBuilder {
             '// GENERATED FILE - DO NOT EDIT\n' +
             'include ":"\n' + settingsGradlePaths.join(''));
 
-        // Update dependencies within build.gradle.
+        // Update SDK versions within root build.gradle - quick fix:
+        let rootGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
+        rootGradle = rootGradle.replace(
+            /(defaultMinSdkVersion)\s*=\s*\d+\s*\/\//,
+            '$1=' + androidManifestInfo.minSdkVersion + ' //');
+        // Note that we are using the configured targetSdkVersion
+        // to update both defaultCompileSdkVersion and
+        // defaultTargetSdkVersion in the root build.gradle
+        rootGradle = rootGradle.replace(
+            /(defaultTargetSdkVersion)\s*=\s*\d+\s*\/\//,
+            '$1=' + androidManifestInfo.targetSdkVersion + ' //');
+        rootGradle = rootGradle.replace(
+            /(defaultCompileSdkVersion)\s*=\s*\d+\s*\/\//,
+            '$1=' + androidManifestInfo.targetSdkVersion + ' //');
+        // and store it (in the root grade):
+        fs.writeFileSync(path.join(this.root, 'build.gradle'), rootGradle);
+
+        // Update dependencies within app/build.gradle.
         var buildGradle = fs.readFileSync(path.join(this.root, 'app', 'build.gradle'), 'utf8');
         var depsList = '';
         var root = this.root;
diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index e4bef9e085..c5b756a3ee 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -102,6 +102,9 @@ if (hasBuildExtras2) {
     apply from: '../build-extras.gradle'
 }
 
+// Needed for quick fix below:
+def customCompileSdkVersion = cdvCompileSdkVersion;
+
 // Set property defaults after extension .gradle files.
 if (ext.cdvCompileSdkVersion == null) {
     ext.cdvCompileSdkVersion = privateHelpers.getProjectTarget()
@@ -124,6 +127,10 @@ ext.cdvVersionCodeForceAbiDigit = cdvVersionCodeForceAbiDigit == null ? false :
 ext.cdvMinSdkVersion = cdvMinSdkVersion == null ? defaultMinSdkVersion : Integer.parseInt('' + cdvMinSdkVersion)
 ext.cdvVersionCode = cdvVersionCode == null ? null : Integer.parseInt('' + cdvVersionCode)
 
+// Quick fix:
+def appTargetSdkVersion =
+    (customCompileSdkVersion == null) ? defaultTargetSdkVersion : Integer.parseInt('' + cdvCompileSdkVersion)
+
 def computeBuildTargetName(debugBuild) {
     def ret = 'assemble'
     if (cdvBuildMultipleApks && cdvBuildArch) {
@@ -170,6 +177,9 @@ android {
         if (cdvMinSdkVersion != null) {
             minSdkVersion cdvMinSdkVersion
         }
+
+        // Quick fix:
+        targetSdkVersion appTargetSdkVersion
     }
 
     lintOptions {
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index fb40bb6602..8cdc83f17c 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -41,9 +41,9 @@ allprojects {
     //This replaces project.properties w.r.t. build settings
     project.ext {
       defaultBuildToolsVersion="28.0.3" //String
-      defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4
-      defaultTargetSdkVersion=28 //Integer - We ALWAYS target the latest by default
-      defaultCompileSdkVersion=28 //Integer - We ALWAYS compile with the latest by default
+      defaultMinSdkVersion=19 //Integer - updated from app/AndroidManifest.xml, minimum requirement should be Android 4.4
+      defaultTargetSdkVersion=28 //Integer - updated from app/AndroidManifest.xml, should target the latest by default
+      defaultCompileSdkVersion=28 //Integer - updated from app/AndroidManifest.xml, should target the latest by default
     }
 }
 
diff --git a/spec/unit/builders/ProjectBuilder.spec.js b/spec/unit/builders/ProjectBuilder.spec.js
index 7db8551792..120bcbf09f 100644
--- a/spec/unit/builders/ProjectBuilder.spec.js
+++ b/spec/unit/builders/ProjectBuilder.spec.js
@@ -88,26 +88,74 @@ describe('ProjectBuilder', () => {
         });
     });
 
-    describe('extractRealProjectNameFromManifest', () => {
+    describe('getAndroidManifestInfo', () => {
         it('should get the project name from the Android Manifest', () => {
             const projectName = 'unittestproject';
             const projectId = `io.cordova.${projectName}`;
-            const manifest = `<?xml version="1.0" encoding="utf-8"?>
-            <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${projectId}"></manifest>`;
+            const manifest =
+                `<?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="${projectId}">
+                <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28"/>
+                </manifest>`;
 
             spyOn(fs, 'readFileSync').and.returnValue(manifest);
 
-            expect(builder.extractRealProjectNameFromManifest()).toBe(projectName);
+            expect(builder.getAndroidManifestInfo().packageName).toBe(projectId);
+        });
+
+        it('should get the min & target SDK versions from the Android Manifest', () => {
+            const projectName = 'unittestproject';
+            const projectId = `io.cordova.${projectName}`;
+            const manifest =
+                `<?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="${projectId}">
+                <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="25"/>
+                </manifest>`;
+
+            spyOn(fs, 'readFileSync').and.returnValue(manifest);
+
+            expect(builder.getAndroidManifestInfo().minSdkVersion).toBe(22);
+            expect(builder.getAndroidManifestInfo().targetSdkVersion).toBe(25);
         });
 
         it('should throw an error if there is no package in the Android manifest', () => {
-            const manifest = `<?xml version="1.0" encoding="utf-8"?>
-            <manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>`;
+            const manifest =
+                `<?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+                <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28"/>
+                </manifest>`;
+
+            spyOn(fs, 'readFileSync').and.returnValue(manifest);
+
+            expect(() => builder.getAndroidManifestInfo()).toThrow(jasmine.any(CordovaError));
+        });
+
+        it('should throw an error if there is no android:minSdkVersion in the Android manifest', () => {
+            const projectName = 'unittestproject';
+            const projectId = `io.cordova.${projectName}`;
+            const manifest =
+                `<?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="${projectId}">
+                <uses-sdk android:targetSdkVersion="25"/>
+                </manifest>`;
+
+            spyOn(fs, 'readFileSync').and.returnValue(manifest);
+
+            expect(() => builder.getAndroidManifestInfo()).toThrow(jasmine.any(CordovaError));
+        });
+
+        it('should throw an error if there is no android:targetSdkVersion in the Android manifest', () => {
+            const projectName = 'unittestproject';
+            const projectId = `io.cordova.${projectName}`;
+            const manifest =
+                `<?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="${projectId}">
+                <uses-sdk android:minSdkVersion="19"/>
+                </manifest>`;
 
             spyOn(fs, 'readFileSync').and.returnValue(manifest);
 
-            expect(() => builder.extractRealProjectNameFromManifest()).toThrow(jasmine.any(CordovaError));
+            expect(() => builder.getAndroidManifestInfo()).toThrow(jasmine.any(CordovaError));
         });
     });
 

From dec5926a3f072b0258dc013e8f16df8fc272fe7f Mon Sep 17 00:00:00 2001
From: "Christopher J. Brody" <chris.brody@gmail.com>
Date: Wed, 23 Jan 2019 22:59:37 -0500
Subject: [PATCH 2/2] empty commit to retrigger build