From 21f64806c0e17cddb57f0a6939c1f12ea8958319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?=
 <erisu@users.noreply.github.com>
Date: Tue, 6 Jul 2021 23:39:12 +0900
Subject: [PATCH] feat: support webkit version override (#1254)

---
 bin/templates/cordova/lib/prepare.js   | 1 +
 bin/templates/project/app/build.gradle | 1 +
 framework/cordova.gradle               | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 9f4b4cfc..e927dff7 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -98,6 +98,7 @@ function getUserGradleConfig (configXml) {
         { xmlKey: 'AndroidGradlePluginVersion', gradleKey: 'AGP_VERSION', type: String },
         { xmlKey: 'GradlePluginKotlinVersion', gradleKey: 'KOTLIN_VERSION', type: String },
         { xmlKey: 'AndroidXAppCompatVersion', gradleKey: 'ANDROIDX_APP_COMPAT_VERSION', type: String },
+        { xmlKey: 'AndroidXWebKitVersion', gradleKey: 'ANDROIDX_WEBKIT_VERSION', type: String },
         { xmlKey: 'GradlePluginGoogleServicesVersion', gradleKey: 'GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION', type: String },
         { xmlKey: 'GradlePluginGoogleServicesEnabled', gradleKey: 'IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED', type: Boolean },
         { xmlKey: 'GradlePluginKotlinEnabled', gradleKey: 'IS_GRADLE_PLUGIN_KOTLIN_ENABLED', type: Boolean }
diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index 8854fead..930a49a2 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -165,6 +165,7 @@ task cdvPrintProps {
         println('cdvBuildArch=' + cdvBuildArch)
         println('computedVersionCode=' + android.defaultConfig.versionCode)
         println('cdvAndroidXAppCompatVersion=' + cdvAndroidXAppCompatVersion)
+        println('cdvAndroidXWebKitVersion=' + cdvAndroidXWebKitVersion)
         android.productFlavors.each { flavor ->
             println('computed' + flavor.name.capitalize() + 'VersionCode=' + flavor.versionCode)
         }
diff --git a/framework/cordova.gradle b/framework/cordova.gradle
index 915357e1..239c4cdf 100644
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -167,6 +167,9 @@ def doApplyCordovaConfigCustomization() {
     if (project.hasProperty('cdvAndroidXAppCompatVersion')) {
         cordovaConfig.ANDROIDX_APP_COMPAT_VERSION = cdvAndroidXAppCompatVersion
     }
+    if (project.hasProperty('cdvAndroidXWebKitVersion')) {
+        cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion
+    }
 
     // Ensure the latest installed build tools is selected, with or without defined override
     cordovaConfig.LATEST_INSTALLED_BUILD_TOOLS = doFindLatestInstalledBuildTools(