Skip to content

Commit

Permalink
Merge pull request #308 from m1ga/updateLibrary
Browse files Browse the repository at this point in the history
feat(android): update library
  • Loading branch information
hansemannn authored Feb 6, 2023
2 parents f3c647a + c549ab9 commit 7393595
Show file tree
Hide file tree
Showing 6 changed files with 15,201 additions and 5,669 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.OS }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand All @@ -45,7 +45,7 @@ jobs:
if: steps.node-cache.outputs.cache-hit != 'true'

- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand All @@ -60,8 +60,8 @@ jobs:
- run: npm i -g titanium
name: Install Titanium CLI

- run: ti sdk install 11.1.1.GA --force
name: Install SDK 11.1.1.GA
- run: ti sdk install --branch master 12.1.0.v20221229113413 --force
name: Install SDK 12.1.0

- name: Set up Homebrew
id: set-up-homebrew
Expand All @@ -71,7 +71,7 @@ jobs:
run: brew install ccache

- name: Retrieve ccache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.CCACHE_DIR }}
key: ${{ runner.os }}-ccache-${{ github.sha }}
Expand All @@ -80,10 +80,12 @@ jobs:
- name: Build and Test
uses: reactivecircus/android-emulator-runner@v2
env:
ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 120
with:
api-level: 29
target: playstore
script: npm run test:android -- --sdkVersion 11.1.1.GA
script: npm run test:android -- --sdkVersion 12.1.0.v20221229113413
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
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies {

// 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:20.0.0'
implementation 'com.google.android.gms:play-services-location:21.0.1'
}
4 changes: 2 additions & 2 deletions 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.1.0
version: 18.2.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86 x86_64
description: Titanium Google Play Services module.
Expand All @@ -14,4 +14,4 @@ name: playservices
moduleid: ti.playservices
guid: 32184149-411f-436b-92a8-c6ddb98a5fb6
platform: android
minsdk: 9.0.0
minsdk: 12.1.0
Loading

0 comments on commit 7393595

Please sign in to comment.