Merge remote-tracking branch 'upstream/master'

Roosterbank · Dec 7, 2023 · 098dc67 · 098dc67
2 parents c26872e + eac7303
commit 098dc67
Show file tree

Hide file tree

Showing 27 changed files with 4,059 additions and 2,092 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -15,6 +15,32 @@
 # specific language governing permissions and limitations
 # under the License.
 
+github:
+  description: Apache Cordova InAppBrowser Plugin
+  homepage: https://cordova.apache.org/
+
+  labels:
+    - android
+    - cordova
+    - hacktoberfest
+    - ios
+    - java
+    - javascript
+    - library
+    - mobile
+    - nodejs
+    - objective-c
+
+  features:
+    wiki: false
+    issues: true
+    projects: true
+
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: false
+
 notifications:
   commits:              [email protected]
   issues:               [email protected]

diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
@@ -13,7 +13,8 @@ For usage and support questions, please check out the resources below. Thanks!
 
 You can get answers to your usage and support questions about **Apache Cordova** on:
 
-* Slack Community Chat: https://cordova.slack.com (you can sign-up at http://slack.cordova.io/)
+* GitHub Discussions: https://github.com/apache/cordova/discussions
+* Slack Community Chat: https://cordova.slack.com (you can sign-up at https://s.apache.org/cordova-slack)
 * StackOverflow: https://stackoverflow.com/questions/tagged/cordova using the tag `cordova`
 
 ---
@@ -22,6 +23,4 @@ If you are using a tool that uses Cordova internally, like e.g. Ionic, check the
 
 * **Ionic Framework**
   * [Ionic Community Forum](https://forum.ionicframework.com/)
-  * [Ionic Worldwide Slack](https://ionicworldwide.herokuapp.com/)
-* **PhoneGap**
-  * [PhoneGap Developer Community](https://forums.adobe.com/community/phonegap)
+  * [Ionic Discord](https://ionic.link/discord)
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,6 +33,7 @@ jobs:
   test:
     name: Android ${{ matrix.versions.android }} Test
     runs-on: macos-latest
+    continue-on-error: true
 
     # hoist configurations to top that are expected to be updated
     env:
@@ -43,8 +44,8 @@ jobs:
 
       # These are the default Java configurations used by most tests.
       # To customize these options, add "java-distro" or "java-version" to the strategy matrix with its overriding value.
-      default_java-distro: adopt
-      default_java-version: 8
+      default_java-distro: temurin
+      default_java-version: 11
 
       # These are the default Android System Image configurations used by most tests.
       # To customize these options, add "system-image-arch" or "system-image-target" to the strategy matrix with its overriding value.
@@ -55,43 +56,31 @@ jobs:
     strategy:
       matrix:
         versions:
-          - android: 5.1
-            android-api: 22
-
-          - android: 6
-            android-api: 23
-
+          # Test the lowest minimum supported APIs
           - android: 7
             android-api: 24
 
-          - android: 7.1
-            android-api: 25
-
-          - android: 8
-            android-api: 26
-
-          - android: 8.1
-            android-api: 27
-            system-image-target: default
-
-          - android: 9
-            android-api: 28
-
+          # Test the last 3-4 supported APIs
           - android: 10
             android-api: 29
 
           - android: 11
             android-api: 30
-            java-version: 11
+
+          - android: 12L
+            android-api: 32
+
+          - android: 13
+            android-api: 33
 
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node-version }}
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         env:
           java-version: ${{ matrix.versions.java-version == '' && env.default_java-version || matrix.versions.java-version }}
           java-distro: ${{ matrix.versions.java-distro == '' && env.default_java-distro || matrix.versions.java-distro }}
@@ -113,10 +102,10 @@ jobs:
           npm ci
 
       - name: Run paramedic install
-        if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }}
+        if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
         run: npm i -g github:apache/cordova-paramedic
 
-      - uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e
+      - uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b
         env:
           system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }}
           system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }}
@@ -130,7 +119,7 @@ jobs:
           script: echo "Pregenerate the AVD before running Paramedic"
 
       - name: Run paramedic tests
-        uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e
+        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b
         env:
           system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }}
           system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }}

diff --git a/.github/workflows/chrome.yml b/.github/workflows/chrome.yml
@@ -42,8 +42,8 @@ jobs:
       node-version: 16
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node-version }}
 
@@ -61,7 +61,7 @@ jobs:
           npm ci
 
       - name: Run paramedic install
-        if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }}
+        if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
         run: npm i -g github:apache/cordova-paramedic
 
       - name: Run paramedic tests

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -33,6 +33,7 @@ jobs:
   test:
     name: iOS ${{ matrix.versions.ios-version }} Test
     runs-on: ${{ matrix.versions.os-version }}
+    continue-on-error: true
 
     # hoist configurations to top that are expected to be updated
     env:
@@ -49,28 +50,28 @@ jobs:
     strategy:
       matrix:
         versions:
-          - os-version: macos-10.15
-            ios-version: 12.x
-            xcode-version: 11.x
-
-          - os-version: macos-10.15
+          - os-version: macos-11
             ios-version: 13.x
             xcode-version: 11.x
 
-          - os-version: macos-10.15
+          - os-version: macos-11
             ios-version: 14.x
             xcode-version: 12.x
 
           - os-version: macos-11
             ios-version: 15.x
             xcode-version: 13.x
 
+          - os-version: macos-12
+            ios-version: 16.x
+            xcode-version: 14.x
+
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.node-version }}
-      - uses: maxim-lobanov/setup-xcode@881be567d30efed8fb3f12b5099d68c3fb72aa3d
+      - uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98
         env:
           xcode-version: ${{ matrix.versions.xcode-version == '' && env.default_xcode-version || matrix.versions.xcode-version }}
         with:
@@ -87,14 +88,8 @@ jobs:
           npm i -g cordova@latest ios-deploy@latest
           npm ci
 
-      - name: Run setup iOS 12.x support
-        if: ${{ matrix.versions.ios-version == '12.x' }}
-        run: |
-          sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
-          sudo ln -s /Applications/Xcode_10.3.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 12.4.simruntime
-
       - name: Run paramedic install
-        if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }}
+        if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
         run: npm i -g github:apache/cordova-paramedic
 
       - name: Run paramedic tests

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -37,8 +37,8 @@ jobs:
       node-version: 16
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node-version }}