Merge pull request #23 from OutSystems/feat/RDMR-412/update-gradle

RDMR-412 :: MABS 11 :: Update Android tools

Author: andredestro

framework/cdv-gradle-config-defaults.json

@@ -1,15 +1,15 @@
 {
-    "MIN_SDK_VERSION": 28,
+    "MIN_SDK_VERSION": 29,
     "SDK_VERSION": 35,
     "COMPILE_SDK_VERSION": null,
-    "GRADLE_VERSION": "8.7",
+    "GRADLE_VERSION": "8.11.1",
     "MIN_BUILD_TOOLS_VERSION": "35.0.0",
-    "AGP_VERSION": "8.3.0",
+    "AGP_VERSION": "8.7.2",
     "KOTLIN_VERSION": "1.9.24",
-    "ANDROIDX_APP_COMPAT_VERSION": "1.6.1",
-    "ANDROIDX_WEBKIT_VERSION": "1.8.0",
+    "ANDROIDX_APP_COMPAT_VERSION": "1.7.0",
+    "ANDROIDX_WEBKIT_VERSION": "1.12.1",
     "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.1",
-    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.0",
+    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.2",
     "IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED": false,
     "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": true,
     "PACKAGE_NAMESPACE": "io.cordova.helloCordova",

lib/Adb.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const os = require('os');
+const os = require('node:os');
 const execa = require('execa');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;

lib/AndroidManifest.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const fs = require('fs');
+const fs = require('node:fs');
 const xml = require('cordova-common').xmlHelpers;
 
 const DEFAULT_ORIENTATION = 'default';

lib/AndroidProject.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const properties_parser = require('properties-parser');
 const pluginHandlers = require('./pluginHandlers');
 const CordovaGradleConfigParserFactory = require('./config/CordovaGradleConfigParserFactory');

lib/Api.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 
 const AndroidProject = require('./AndroidProject');
 const PluginManager = require('cordova-common').PluginManager;

lib/build.js

@@ -17,8 +17,8 @@
        under the License.
 */
 
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const fs = require('node:fs');
 const nopt = require('nopt');
 const untildify = require('untildify');
 const { parseArgsStringToArgv } = require('string-argv');

lib/builders/ProjectBuilder.js

@@ -18,7 +18,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const execa = require('execa');
 const glob = require('fast-glob');
 const events = require('cordova-common').events;

lib/check_reqs.js

@@ -18,7 +18,7 @@
 */
 
 const execa = require('execa');
-const path = require('path');
+const path = require('node:path');
 const fs = require('fs-extra');
 const { forgivingWhichSync, isWindows, isDarwin } = require('./utils');
 const java = require('./env/java');

lib/config/CordovaGradleConfigParser.js

@@ -18,7 +18,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const events = require('cordova-common').events;
 
 class CordovaGradleConfigParser {

lib/config/GradlePropertiesParser.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const propertiesParser = require('properties-parser');
 const events = require('cordova-common').events;
 

lib/create.js

@@ -17,7 +17,7 @@
        under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const fs = require('fs-extra');
 const utils = require('./utils');
 const check_reqs = require('./check_reqs');

lib/emulator.js

@@ -20,7 +20,7 @@
 const execa = require('execa');
 const fs = require('fs-extra');
 const android_versions = require('android-versions');
-const path = require('path');
+const path = require('node:path');
 const Adb = require('./Adb');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;

lib/env/java.js

@@ -19,7 +19,7 @@
 
 const execa = require('execa');
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const glob = require('fast-glob');
 const { CordovaError, events } = require('cordova-common');
 const utils = require('../utils');

lib/pluginHandlers.js

@@ -15,7 +15,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const isPathInside = require('is-path-inside');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;

lib/prepare.js

@@ -18,7 +18,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const nopt = require('nopt');
 const glob = require('fast-glob');
 const dedent = require('dedent');

lib/target.js

@@ -17,7 +17,7 @@
        under the License.
 */
 
-const { inspect } = require('util');
+const { inspect } = require('node:util');
 const execa = require('execa');
 const Adb = require('./Adb');
 const build = require('./build');

lib/utils.js

@@ -25,7 +25,7 @@
 
 const fs = require('fs-extra');
 const which = require('which');
-const os = require('os');
+const os = require('node:os');
 
 /**
  * Reads, searches, and replaces the found occurences with replacementString and then writes the file back out.

spec/e2e/e2e.spec.js

@@ -17,9 +17,9 @@
  under the License.
  */
 
-const os = require('os');
+const os = require('node:os');
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const { EventEmitter } = require('events');
 const { ConfigParser, PluginInfoProvider } = require('cordova-common');
 const Api = require('../../lib/Api');

spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties

@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

spec/unit/AndroidManifest.spec.js

@@ -17,9 +17,9 @@
     under the License.
 */
 
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
 const rewire = require('rewire');
 
 describe('AndroidManifest', () => {

spec/unit/AndroidProject.spec.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const MockCordovaGradleConfigParser = require('./mocks/config/MockCordovaGradleConfigParser');
 const CordovaGradleConfigParserFactory = require('../../lib/config/CordovaGradleConfigParserFactory');

spec/unit/Api.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const os = require('os');
-const path = require('path');
+const os = require('node:os');
+const path = require('node:path');
 const common = require('cordova-common');
 const EventEmitter = require('events');
 

spec/unit/android_sdk.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const rewire = require('rewire');
 
 describe('android_sdk', () => {

spec/unit/builders/ProjectBuilder.spec.js

@@ -18,7 +18,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const { isWindows } = require('../../../lib/utils');
 

spec/unit/check_reqs.spec.js

@@ -20,7 +20,7 @@
 const rewire = require('rewire');
 const android_sdk = require('../../lib/android_sdk');
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const events = require('cordova-common').events;
 const which = require('which');
 

spec/unit/create.spec.js

@@ -22,7 +22,7 @@ const utils = require('../../lib/utils');
 const create = rewire('../../lib/create');
 const check_reqs = require('../../lib/check_reqs');
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const MockCordovaGradleConfigParser = require('./mocks/config/MockCordovaGradleConfigParser');
 const CordovaGradleConfigParserFactory = require('../../lib/config/CordovaGradleConfigParserFactory');
 

spec/unit/emulator.spec.js

@@ -18,7 +18,7 @@
 */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const which = require('which');
 

spec/unit/java.spec.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const { CordovaError } = require('cordova-common');
 const utils = require('../../lib/utils');

spec/unit/pluginHandlers/common.spec.js

@@ -18,7 +18,7 @@
 
 const rewire = require('rewire');
 const common = rewire('../../../lib/pluginHandlers');
-const path = require('path');
+const path = require('node:path');
 const fs = require('fs-extra');
 const osenv = require('os');
 

spec/unit/pluginHandlers/handlers.spec.js

@@ -20,9 +20,9 @@
 const rewire = require('rewire');
 const common = rewire('../../../lib/pluginHandlers');
 const android = common.__get__('handlers');
-const path = require('path');
+const path = require('node:path');
 const fs = require('fs-extra');
-const os = require('os');
+const os = require('node:os');
 const temp = path.join(os.tmpdir(), 'plugman');
 const plugins_dir = path.join(temp, 'cordova/plugins');
 const dummyplugin = path.join(__dirname, '../../fixtures/org.test.plugins.dummyplugin');

spec/unit/prepare.spec.js

@@ -18,7 +18,7 @@
 */
 
 const rewire = require('rewire');
-const path = require('path');
+const path = require('node:path');
 const CordovaError = require('cordova-common').CordovaError;
 const GradlePropertiesParser = require('../../lib/config/GradlePropertiesParser');
 const utils = require('../../lib/utils');

templates/project/app/build.gradle

@@ -335,7 +335,16 @@ dependencies {
     implementation "androidx.core:core-splashscreen:${cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION}"
 
     if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:${cordovaConfig.KOTLIN_VERSION}"
+    }
+
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
     }
 
     // SUB-PROJECT DEPENDENCIES START

test/run_java_unit_tests.js

@@ -19,7 +19,7 @@
        under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const execa = require('execa');
 const fs = require('fs-extra');
 const ProjectBuilder = require('../lib/builders/ProjectBuilder');