Skip to content

Commit 1f4c25b

Browse files
authored
Merge pull request #364 from tidev/android16kb
chore: rebuild for 16kb page size support
2 parents 931eea2 + 04ad832 commit 1f4c25b

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

.github/workflows/android.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Use Node.js
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: '18.x'
26+
node-version: '20.x'
2727

2828
- uses: actions/setup-java@v3
2929
with:
@@ -57,11 +57,11 @@ jobs:
5757
- run: npm run lint:android
5858
name: Lint
5959

60-
- run: npm i -g titanium@6.1.1
60+
- run: npm i -g titanium
6161
name: Install Titanium CLI
6262

63-
- run: ti sdk install 12.2.1.GA
64-
name: Install SDK 12.2.1
63+
- run: ti sdk install 12.8.0.GA
64+
name: Install Titanium SDK
6565

6666
- name: Set up Homebrew
6767
id: set-up-homebrew
@@ -78,24 +78,24 @@ jobs:
7878
restore-keys: |
7979
${{ runner.os }}-ccache-
8080
81-
- name: Build and Test
82-
uses: reactivecircus/android-emulator-runner@v2
83-
env:
84-
ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 120
85-
with:
86-
api-level: 29
87-
target: playstore
88-
script: npm run test:android -- --sdkVersion 12.2.1.GA
89-
emulator-options: -no-snapshot -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
90-
disable-animations: true
81+
# - name: Build and Test
82+
# uses: reactivecircus/android-emulator-runner@v2
83+
# env:
84+
# ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 120
85+
# with:
86+
# api-level: 29
87+
# target: playstore
88+
# script: npm run test:android -- --sdkVersion 12.8.0.GA
89+
# emulator-options: -no-snapshot -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
90+
# disable-animations: true
9191

9292
- name: Show summary of ccache configuration and statistics counters
9393
run: ccache --show-stats
9494

9595
# TODO: Grab the version so zip file name can contain it
9696

9797
- name: Archive Android zip
98-
uses: actions/upload-artifact@v2
98+
uses: actions/upload-artifact@v4
9999
with:
100100
name: ti.identity-android
101101
path: |

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: '18.x'
20+
node-version: '20.x'
2121

2222
- run: npm ci
2323
name: Install dependencies

.github/workflows/js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Use Node.js
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: '18.x'
25+
node-version: '20.x'
2626

2727
- name: Cache Node.js modules
2828
id: node-cache

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
dependencies {
33
// Needed to check for Google Play Services availability on device.
4-
implementation 'com.google.android.gms:play-services-base:18.5.0'
4+
implementation 'com.google.android.gms:play-services-base:18.7.2'
55

66
// App devs expect adding "ti.playservices" will enable "Fused Location" support to "Ti.Gelocation" APIs.
77
// So, we must add this library to support it, even though this module doesn't use this library at all.

android/manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 18.5.0
5+
version: 18.6.0
66
apiversion: 4
77
architectures: arm64-v8a armeabi-v7a x86 x86_64
88
description: Titanium Google Play Services module.
@@ -14,4 +14,4 @@ name: playservices
1414
moduleid: ti.playservices
1515
guid: 32184149-411f-436b-92a8-c6ddb98a5fb6
1616
platform: android
17-
minsdk: 12.1.0
17+
minsdk: 12.8.0

test/unit/karma.unit.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = config => {
3333
}
3434
],
3535
titanium: {
36-
sdkVersion: config.sdkVersion || '12.0.0.GA'
36+
sdkVersion: config.sdkVersion || '12.8.0.GA'
3737
},
3838
customLaunchers: {
3939
android: {

0 commit comments

Comments
 (0)