Merge pull request #21 from OutSystems/feat/RDMR-251/add-relevant-com…

…mits RDMR-251 ::: Prepare our fork of cordova-android 13.0.0
OutSystems · Sep 26, 2024 · 5153b80 · 5153b80
2 parents 2143045 + 5de47e1
commit 5153b80
Show file tree

Hide file tree

Showing 26 changed files with 827 additions and 123 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,15 +28,16 @@ jobs:
     strategy:
       matrix:
         node-version: [16.x, 18.x, 20.x, 22.x]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
-      - uses: actions/setup-java@v4
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -68,12 +69,3 @@ jobs:
           npm t
         env:
           CI: true
-
-      - uses: github/codeql-action/analyze@v3
-
-      - uses: codecov/codecov-action@v4
-        if: success()
-        with:
-          name: ${{ runner.os }} node.js ${{ matrix.node-version }}
-          token: ${{ secrets.CORDOVA_CODECOV_TOKEN }}
-          fail_ci_if_error: false
diff --git a/cordova-js-src/plugin/android/splashscreen.js b/cordova-js-src/plugin/android/splashscreen.js
@@ -23,7 +23,7 @@ var exec = require('cordova/exec');
 
 var splashscreen = {
     show: function () {
-        console.log('"navigator.splashscreen.show()" is unsupported on Android.');
+        exec(null, null, 'CordovaSplashScreenPlugin', 'show', []);
     },
     hide: function () {
         exec(null, null, 'CordovaSplashScreenPlugin', 'hide', []);

diff --git a/framework/cdv-gradle-config-defaults.json b/framework/cdv-gradle-config-defaults.json
@@ -1,17 +1,17 @@
 {
-    "MIN_SDK_VERSION": 24,
+    "MIN_SDK_VERSION": 28,
     "SDK_VERSION": 34,
     "COMPILE_SDK_VERSION": null,
     "GRADLE_VERSION": "8.7",
     "MIN_BUILD_TOOLS_VERSION": "34.0.0",
     "AGP_VERSION": "8.3.0",
     "KOTLIN_VERSION": "1.9.24",
     "ANDROIDX_APP_COMPAT_VERSION": "1.6.1",
-    "ANDROIDX_WEBKIT_VERSION": "1.6.0",
-    "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.0",
-    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.3.15",
+    "ANDROIDX_WEBKIT_VERSION": "1.8.0",
+    "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.1",
+    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.0",
     "IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED": false,
-    "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": false,
+    "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": true,
     "PACKAGE_NAMESPACE": "io.cordova.helloCordova",
     "JAVA_SOURCE_COMPATIBILITY": 8,
     "JAVA_TARGET_COMPATIBILITY": 8,

diff --git a/framework/cordova.gradle b/framework/cordova.gradle
@@ -172,6 +172,9 @@ def doApplyCordovaConfigCustomization() {
     if (project.hasProperty('cdvAndroidXWebKitVersion')) {
         cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion
     }
+    if (project.hasProperty('cdvAndroidXCoreSplashscreenVersion')) {
+        cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION = cdvAndroidXCoreSplashscreenVersion
+    }
 
     if (!cordovaConfig.BUILD_TOOLS_VERSION) {
         cordovaConfig.BUILD_TOOLS_VERSION = doFindLatestInstalledBuildTools(

diff --git a/framework/gradle.properties b/framework/gradle.properties
@@ -28,7 +28,6 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
-android.enableJetifier=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -186,6 +186,7 @@ protected void createViews() {
         appView.getView().setLayoutParams(new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
+        appView.getView().setFilterTouchesWhenObscured(preferences.getBoolean("FilterTouchesWhenObscured", true));
 
         setContentView(appView.getView());
 

diff --git a/framework/src/org/apache/cordova/CordovaWebViewImpl.java b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -267,6 +267,8 @@ public void showWebPage(String url, boolean openExternal, boolean clearHistory,
             } else {
                 LOG.e(TAG, "Error loading url " + url, e);
             }
+        } catch (Exception e) {
+            LOG.e(TAG, "Error loading url " + url + " with error on file URI exposed", e);
         }
     }