Skip to content

Commit

Permalink
Merge pull request #23 from OutSystems/misc/sync-upstream
Browse files Browse the repository at this point in the history
Sync upstream
  • Loading branch information
andredestro authored Aug 9, 2024
2 parents 6c1ebbe + 59ac909 commit a132b6c
Show file tree
Hide file tree
Showing 21 changed files with 1,101 additions and 2,460 deletions.
26 changes: 26 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,32 @@
# specific language governing permissions and limitations
# under the License.

github:
description: Apache Cordova Status Bar 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]
Expand Down
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

---
Expand All @@ -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)
49 changes: 31 additions & 18 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ on:
- '**.md'
- 'LICENSE'
- '.eslint*'

pull_request:
paths-ignore:
- '**.md'
Expand All @@ -32,19 +33,20 @@ on:
jobs:
test:
name: Android ${{ matrix.versions.android }} Test
runs-on: macos-latest
runs-on: ubuntu-latest
continue-on-error: true

# hoist configurations to top that are expected to be updated
env:
# Storing a copy of the repo
repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }}

node-version: 16
node-version: 20

# 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: 17

# 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.
Expand All @@ -55,12 +57,6 @@ jobs:
strategy:
matrix:
versions:
- android: 5.1
android-api: 22

- android: 6
android-api: 23

- android: 7
android-api: 24

Expand All @@ -72,7 +68,7 @@ jobs:

- android: 8.1
android-api: 27
system-image-target: default
system-image-arch: x86

- android: 9
android-api: 28
Expand All @@ -82,23 +78,40 @@ jobs:

- android: 11
android-api: 30
java-version: 11

- android: 12
android-api: 31

- android: 12L
android-api: 32

- android: 13
android-api: 33

- android: 14
android-api: 34

timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
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 }}
with:
distribution: ${{ env.java-distro }}
java-version: ${{ env.java-version }}

- name: Enable KVM group perms
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
- name: Run Environment Information
run: |
node --version
Expand All @@ -113,10 +126,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@v2
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 }}
Expand All @@ -130,7 +143,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@v2
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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/chrome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:
# Storing a copy of the repo
repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }}

node-version: 16
node-version: 20

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}

Expand All @@ -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
Expand Down
39 changes: 15 additions & 24 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ 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:
# Storing a copy of the repo
repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }}

node-version: 16
node-version: 20

# > Starting April 26, 2021, all iOS and iPadOS apps submitted to the App Store must be built with Xcode 12 and the iOS 14 SDK.
# Because of Apple's requirement, listed above, We will only be using the latest Xcode release for testing.
Expand All @@ -49,28 +50,24 @@ jobs:
strategy:
matrix:
versions:
- os-version: macos-10.15
ios-version: 12.x
xcode-version: 11.x

- os-version: macos-10.15
ios-version: 13.x
xcode-version: 11.x

- os-version: macos-10.15
ios-version: 14.x
xcode-version: 12.x

- os-version: macos-11
- os-version: macos-12
ios-version: 15.x
xcode-version: 13.x

- os-version: macos-14
ios-version: 16.x
xcode-version: 14.x

- os-version: macos-14
ios-version: 17.x
xcode-version: 15.x

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
- uses: maxim-lobanov/setup-xcode@881be567d30efed8fb3f12b5099d68c3fb72aa3d
- uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd
env:
xcode-version: ${{ matrix.versions.xcode-version == '' && env.default_xcode-version || matrix.versions.xcode-version }}
with:
Expand All @@ -87,14 +84,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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
name: Lint Test
runs-on: ubuntu-latest
env:
node-version: 16
node-version: 20

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}

Expand Down
50 changes: 3 additions & 47 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Preferences

<preference name="StatusBarBackgroundColor" value="#000000" />

- __StatusBarStyle__ (status bar style, defaults to lightcontent). Set the status bar style (e.g. text color). Available options: `default`, `lightcontent`. `blacktranslucent` and `blackopaque` are also available, but __deprecated__, will be removed in next major release, use `lightcontent` instead.
- __StatusBarStyle__ (status bar style, defaults to lightcontent). Set the status bar style (e.g. text color). Available options: `default`, `lightcontent`.

<preference name="StatusBarStyle" value="lightcontent" />

Expand Down Expand Up @@ -118,8 +118,6 @@ Although in the global scope, it is not available until after the `deviceready`
- StatusBar.overlaysWebView
- StatusBar.styleDefault
- StatusBar.styleLightContent
- StatusBar.styleBlackTranslucent
- StatusBar.styleBlackOpaque
- StatusBar.backgroundColorByName
- StatusBar.backgroundColorByHexString
- StatusBar.hide
Expand Down Expand Up @@ -173,7 +171,6 @@ Supported Platforms

- iOS
- Android 6+
- Windows

StatusBar.styleLightContent
=================
Expand All @@ -188,42 +185,6 @@ Supported Platforms

- iOS
- Android 6+
- Windows

StatusBar.styleBlackTranslucent
=================

Note: `styleBlackTranslucent` is __deprecated__ and will be removed in next major release, use `styleLightContent` instead.

Use the blackTranslucent statusbar (light text, for dark backgrounds).

StatusBar.styleBlackTranslucent();


Supported Platforms
-------------------

- iOS
- Android 6+
- Windows

StatusBar.styleBlackOpaque
=================

Note: `styleBlackOpaque` is __deprecated__ and will be removed in next major release, use `styleLightContent` instead.

Use the blackOpaque statusbar (light text, for dark backgrounds).

StatusBar.styleBlackOpaque();


Supported Platforms
-------------------

- iOS
- Android 6+
- Windows


StatusBar.backgroundColorByName
=================
Expand All @@ -241,8 +202,7 @@ Supported Platforms
-------------------

- iOS
- Android 5+
- Windows
- Android

StatusBar.backgroundColorByHexString
=================
Expand All @@ -264,8 +224,7 @@ Supported Platforms
-------------------

- iOS
- Android 5+
- Windows
- Android

StatusBar.hide
=================
Expand All @@ -280,7 +239,6 @@ Supported Platforms

- iOS
- Android
- Windows

StatusBar.show
=================
Expand All @@ -295,7 +253,6 @@ Supported Platforms

- iOS
- Android
- Windows

StatusBar.isVisible
=================
Expand All @@ -312,7 +269,6 @@ Supported Platforms

- iOS
- Android
- Windows

statusTap
=========
Expand Down
Loading

0 comments on commit a132b6c

Please sign in to comment.