Cordova 15 (#420)

* Cordova 15 * Remove docs
urbanairship · Mar 4, 2024 · 57b8503 · 57b8503
1 parent c3e07bd
commit 57b8503
Show file tree

Hide file tree

Showing 88 changed files with 5,276 additions and 9,040 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # https://help.github.com/en/articles/about-code-owners
-*       @BrianBatchelder @marc-scig @crow @rlepinski
+*       @urbanairship/mobile
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -3,4 +3,4 @@
 We accept pull requests! If you would like to submit a pull request, please fill out and submit our
 [Contributor License Agreement](https://docs.google.com/forms/d/e/1FAIpQLScErfiz-fXSPpVZ9r8Di2Tr2xDFxt5MgzUel0__9vqUgvko7Q/viewform).
 
-One of our engineers will verify receipt of the agreement before approving your pull request.
+One of our engineers will verify receipt of the agreement before approving your pull request.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -2,30 +2,26 @@ name: CI
 
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   android:
-    runs-on: macos-11
+    runs-on: macos-13-xlarge
+    timeout-minutes: 10
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v1
-        # Build tools 31.0.0 doesn't include dx (only d8), which Cordova expects to find.
-        # Uninstalling causes automatic build-tools resolution to fall back to an older
-        # version that does include dx.
-      - name: Workaround "Build-tool 31.0.0 is missing DX" error
-        run: bash $ANDROID_SDK_ROOT/tools/bin/sdkmanager --uninstall 'build-tools;31.0.0'
-        # Build tools 32.0.0 doesn't include dx (only d8), which Cordova expects to find.
-        # Uninstalling causes automatic build-tools resolution to fall back to an older
-        # version that does include dx.
-      - name: Workaround "Build-tool 32.0.0 is missing DX" error
-        run: bash $ANDROID_SDK_ROOT/tools/bin/sdkmanager --uninstall 'build-tools;32.0.0'
+      - uses: actions/checkout@v4
       - name: Run CI
         run: bash ./scripts/run_ci_tasks.sh -a
   ios:
-    runs-on: macos-11
+    runs-on: macos-13-xlarge
+    timeout-minutes: 10
     env:
-      DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Run CI
         run: bash ./scripts/run_ci_tasks.sh -i
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,36 +7,27 @@ on:
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: macos-13-xlarge
+    timeout-minutes: 20
     env:
-      DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Check Version
         run: bash ./scripts/check_version.sh ${GITHUB_REF/refs\/tags\//}
       - name: Slack Notification
-        uses: homoluctus/slatify@master
+        uses: lazy-actions/slatify@master
         with:
           type: ${{ job.status }}
           job_name: "Airship Cordova Plugin Release Started!"
           url: ${{ secrets.SLACK_WEBHOOK }}
-        # Build tools 31.0.0 doesn't include dx (only d8), which Cordova expects to find.
-        # Uninstalling causes automatic build-tools resolution to fall back to an older
-        # version that does include dx.
-      - name: Workaround "Build-tool 31.0.0 is missing DX" error
-        run: bash $ANDROID_SDK_ROOT/tools/bin/sdkmanager --uninstall 'build-tools;31.0.0'
-        # Build tools 32.0.0 doesn't include dx (only d8), which Cordova expects to find.
-        # Uninstalling causes automatic build-tools resolution to fall back to an older
-        # version that does include dx.
-      - name: Workaround "Build-tool 32.0.0 is missing DX" error
-        run: bash $ANDROID_SDK_ROOT/tools/bin/sdkmanager --uninstall 'build-tools;32.0.0'
       - name: Run CI
         run: |
           bash ./scripts/run_ci_tasks.sh -a -i
       - name: Slack Notification
-        uses: homoluctus/slatify@master
+        uses: lazy-actions/slatify@master
         if: failure()
         with:
           type: ${{ job.status }}
@@ -46,9 +37,11 @@ jobs:
   deploy:
     needs: [build]
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
@@ -71,32 +64,33 @@ jobs:
         with:
           node-version: 14
           registry-url: https://registry.npmjs.org/
-      - name: Generate documentation
-        run: |
-          yarn install
-          yarn generate-docs
       - uses: google-github-actions/setup-gcloud@v0
         with:
           version: '351.0.0'
           service_account_email: ${{ secrets.GCP_SA_EMAIL }}
-          service_account_key: ${{ secrets.GCP_SA_KEY }}
-      - name: Upload docs
-        run: bash ./scripts/upload_docs.sh ${GITHUB_REF/refs\/tags\//} jsdoc_out
-      - name: Publish modules
+          service_account_key: ${{ secrets.GCP_SA_KEY }}          
+
+      - name: Docs
         run: |
           cd urbanairship-cordova/
-          yarn publish
+          npm install
+          npm run generate-docs
           cd -
-          cd urbanairship-accengage-cordova/
-          yarn publish
+          bash ./scripts/upload_docs.sh ${GITHUB_REF/refs\/tags\//} ./urbanairship-cordova/docs
+
+      - name: Publish modules
+        run: |
+          cd cordova-airship/
+          npm publish
           cd -
-          cd urbanairship-hms-cordova/
-          yarn publish
+          cd cordova-airship-hms/
+          npm publish
           cd -
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
       - name: Github Release
-        uses: actions/[email protected]
+        id: create_release
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -106,13 +100,13 @@ jobs:
           draft: false
           prerelease: false
       - name: Slack Notification
-        uses: homoluctus/slatify@master
+        uses: lazy-actions/slatify@master
         with:
           type: ${{ job.status }}
           job_name: "Airship Cordova Plugin Released!"
           url: ${{ secrets.SLACK_WEBHOOK }}
       - name: Slack Notification
-        uses: homoluctus/slatify@master
+        uses: lazy-actions/slatify@master
         if: failure()
         with:
           type: ${{ job.status }}

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ out/*
 node_modules/*
 scripts/update_cordova/node_modules/*
 config_sample.xml
+cordova-airship/docs
+google-services.json
diff --git a/COPYING b/COPYING
@@ -1,13 +1,13 @@
-Copyright 2010-2019 Urban Airship
+Copyright 2010-2024 Airship and Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.