fix: compile sdk requirement warning & display in gradle per subproject

apache · May 16, 2022 · 30fbc85 · 30fbc85
1 parent 802ff14
commit 30fbc85
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/framework/build.gradle b/framework/build.gradle
@@ -26,6 +26,8 @@ buildscript {
         // Android Gradle Plugin (AGP) Build Tools
         classpath "com.android.tools.build:gradle:${cordovaConfig.AGP_VERSION}"
     }
+
+    cdvHelpers.verifyCordovaConfigForBuild()
 }
 
 allprojects {

diff --git a/framework/cordova.gradle b/framework/cordova.gradle
@@ -191,9 +191,11 @@ def doApplyCordovaConfigCustomization() {
             but got Android Build Tools version ${cordovaConfig.BUILD_TOOLS_VERSION}. Please use version ${cordovaConfig.MIN_BUILD_TOOLS_VERSION} or later.
         """.replaceAll(/\s+/, ' ').trim())
     }
+}
 
+def doVerifyCordovaConfigForBuild() {
     if (cordovaConfig.COMPILE_SDK_VERSION < cordovaConfig.SDK_VERSION) {
-        println "The compileSdkVersion (${cordovaConfig.COMPILE_SDK_VERSION}) should be greater than or equal to the the targetSdkVersion (${cordovaConfig.SDK_VERSION}.)"
+        println "The \"compileSdkVersion\" (${cordovaConfig.COMPILE_SDK_VERSION}) should be greater than or equal to the the \"targetSdkVersion\" (${cordovaConfig.SDK_VERSION})."
     }
 }
 
@@ -238,6 +240,8 @@ ext {
     cdvHelpers.getConfigXml = { doGetConfigXml() }
     // Returns the value for the desired <preference>. Added in 4.1.0.
     cdvHelpers.getConfigPreference = { name, defaultValue -> doGetConfigPreference(name, defaultValue) }
+    // Display warnings if any cordova config is not proper for build.
+    cdvHelpers.verifyCordovaConfigForBuild = { doVerifyCordovaConfigForBuild() }
 }
 
 buildscript {

diff --git a/lib/check_reqs.js b/lib/check_reqs.js
@@ -63,7 +63,7 @@ module.exports.isCompileSdkValid = (compileSdk, targetSdk) => {
     const isValid = compileSdk >= targetSdk;
 
     if (!isValid) {
-        events.emit('warn', `android-compileSdkVersion should be greater than or equal to the android-targetSdkVersion (${targetSdk}.)`);
+        events.emit('warn', `The "android-compileSdkVersion" (${compileSdk}) should be greater than or equal to the "android-targetSdkVersion" (${targetSdk}).`);
     }
 
     return isValid;

diff --git a/templates/project/build.gradle b/templates/project/build.gradle
@@ -27,6 +27,8 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
+
+    cdvHelpers.verifyCordovaConfigForBuild()
 }
 
 allprojects {