Skip to content

Commit

Permalink
Merge pull request #230 from m1ga/update_18_0_1
Browse files Browse the repository at this point in the history
feat(android): update to 18.1.0
  • Loading branch information
hansemannn authored Nov 26, 2022
2 parents c3e4573 + d96d96b commit f3c647a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
22 changes: 15 additions & 7 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 @@ -20,10 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v2

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

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

- name: Cache Node.js modules
id: node-cache
Expand Down Expand Up @@ -55,9 +60,12 @@ jobs:
- run: npm i -g titanium
name: Install Titanium CLI

# TODO: Cache sdk install
- run: ti sdk install 9.3.2.GA --force
name: Install SDK 9.3.2.GA
- run: ti sdk install 11.1.1.GA --force
name: Install SDK 11.1.1.GA

- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Install ccache
run: brew install ccache
Expand All @@ -75,7 +83,7 @@ jobs:
with:
api-level: 29
target: playstore
script: npm run test:android -- --sdkVersion 9.3.2.GA
script: npm run test:android -- --sdkVersion 11.1.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

- name: Show summary of ccache configuration and statistics counters
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:17.5.0'
implementation 'com.google.android.gms:play-services-base:18.1.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:17.1.0'
implementation 'com.google.android.gms:play-services-location:20.0.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: 17.5.0
version: 18.1.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86 x86_64
description: Titanium Google Play Services module.
Expand Down

0 comments on commit f3c647a

Please sign in to comment.