Skip to content

Commit

Permalink
Merge pull request #341 from tidev/update_18_3_0
Browse files Browse the repository at this point in the history
chore(android): update to 18.3.0
  • Loading branch information
hansemannn authored May 15, 2024
2 parents 352d1da + e684d9f commit 69083d0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 25 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ on:

jobs:
android:
runs-on: macos-latest
runs-on: macos-13
name: Android
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js 16.x
uses: actions/setup-node@v1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '16.x'
node-version: '18.x'

- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
java-version: '17'

- name: Cache Node.js modules
id: node-cache
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- run: npm run lint:android
name: Lint

- run: npm i -g titanium
- run: npm i -g titanium@6.1.1
name: Install Titanium CLI

- run: ti sdk install 12.2.1.GA
Expand Down Expand Up @@ -86,7 +86,8 @@ jobs:
api-level: 29
target: playstore
script: npm run test:android -- --sdkVersion 12.2.1.GA
disable-animations: false # defaulting to true, the commands sent to emulator to do this sometimes run too quickly after boot and cause "adb: device offline" failures
emulator-options: -no-snapshot -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
disable-animations: true

- name: Show summary of ccache configuration and statistics counters
run: ccache --show-stats
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
name: Docs
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

- run: npm ci
name: Install dependencies
Expand Down
14 changes: 7 additions & 7 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,22 +11,22 @@ on:
- '**.json'
- '**.eslint*'
workflow_dispatch:

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

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

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.OS }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/regen-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand All @@ -30,7 +30,7 @@ jobs:

- run: npm run lint:docs
name: Lint

- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

dependencies {
// Needed to check for Google Play Services availability on device.
implementation 'com.google.android.gms:play-services-base:18.2.0'
implementation 'com.google.android.gms:play-services-base:18.3.0'

// App devs expect adding "ti.playservices" will enable "Fused Location" support to "Ti.Gelocation" APIs.
// So, we must add this library to support it, even though this module doesn't use this library at all.
implementation 'com.google.android.gms:play-services-location:21.0.1'
implementation 'com.google.android.gms:play-services-location:21.1.0'
}
2 changes: 1 addition & 1 deletion android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 18.2.1
version: 18.3.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86 x86_64
description: Titanium Google Play Services module.
Expand Down

0 comments on commit 69083d0

Please sign in to comment.