Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(android): update nodeDeps #296

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android Build
on:
on:
push:
paths-ignore:
- 'ios/**'
Expand All @@ -17,15 +17,15 @@ jobs:
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
SDK_VERSION: 10.1.0.v20210820083427
SDK_VERSION: 11.0.0.GA
MODULE_ID: appcelerator.ble
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Use JDK 11
uses: actions/setup-java@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- run: npm ci
name: Install dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: iOS Build
on:
on:
push:
paths-ignore:
- 'android/**'
Expand All @@ -9,21 +9,21 @@ on:
- 'android/**'
- 'apidoc/**'
workflow_dispatch:

jobs:
ios:
runs-on: macos-latest
name: iOS
env:
SDK_VERSION: 9.3.2.GA
SDK_VERSION: 11.0.0.GA
MODULE_ID: appcelerator.ble
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache Node.js modules
id: node-cache
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: JavaScript Lint
on:
on:
push:
paths:
- '**.js'
Expand All @@ -11,18 +11,18 @@ on:
- '**.json'
- '**.eslint*'
workflow_dispatch:

jobs:
js:
runs-on: ubuntu-latest
name: JavaScript
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache Node.js modules
id: node-cache
Expand Down
3 changes: 2 additions & 1 deletion android/src/appcelerator/ble/TiBLEPeripheralProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ public BluetoothDevice getDevice()
return device;
}

public interface IOperationHandler {
public interface IOperationHandler
{
boolean isConnected(TiBLEPeripheralProxy peripheralProxy);
void readRSSI();
void requestConnectionPriority(int priority);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ private TiBLESubscribedCentrals()
public static TiBLESubscribedCentrals getInstance()
{
if (subscribedCentrals == null) {
synchronized (TiBLESubscribedCentrals.class)
{
synchronized (TiBLESubscribedCentrals.class) {
if (subscribedCentrals == null) {
subscribedCentrals = new TiBLESubscribedCentrals();
}
Expand Down
3 changes: 2 additions & 1 deletion android/src/appcelerator/ble/scan/ScanManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ public static ScanManager build(BluetoothAdapter btAdapter, IScanDeviceFoundList
abstract protected void doScan(String[] servicesUUIDs);
abstract protected void killScan();

public interface IScanDeviceFoundListener {
public interface IScanDeviceFoundListener
{
void onScanDeviceFound(BluetoothDevice bluetoothDevice, int i, byte[] bytes);
}
}
Loading