Skip to content

Commit d8986ae

Browse files
Merge branch 'master' into moo/moo-2083/iosLocationIssue
2 parents 6388dfe + 7930852 commit d8986ae

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

.github/workflows/android-build-custom-dev-app.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ jobs:
2929
- name: npm install
3030
run: npm ci
3131

32-
- name: Add NDK 26.1.10909125
33-
run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;26.1.10909125"
34-
32+
- name: Add NDK 27.3.13750724
33+
run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.3.13750724"
3534
- name: Build with Gradle
3635
run: ./gradlew assembleDevDebug
3736
working-directory: ./android

android/build.gradle

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
androidXCore = "1.6.0"
1313
androidXBrowser = "1.3.0"
1414

15-
ndkVersion = "26.1.10909125"
15+
ndkVersion = "27.3.13750724"
1616
}
1717
repositories {
1818
google()
@@ -84,6 +84,31 @@ allprojects {
8484
maven {
8585
url "$rootDir/../node_modules/@notifee/react-native/android/libs"
8686
}
87+
88+
// Build all modules with Android 16KB pages enabled
89+
plugins.withId('com.android.application') {
90+
android {
91+
defaultConfig {
92+
externalNativeBuild {
93+
cmake {
94+
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
95+
}
96+
}
97+
}
98+
}
99+
}
100+
101+
plugins.withId('com.android.library') {
102+
android {
103+
defaultConfig {
104+
externalNativeBuild {
105+
cmake {
106+
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
107+
}
108+
}
109+
}
110+
}
111+
}
87112
}
88113
}
89114

ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,9 +2237,9 @@ PODS:
22372237
- ReactCommon/turbomodule/bridging
22382238
- ReactCommon/turbomodule/core
22392239
- Yoga
2240-
- SDWebImage (5.21.2):
2241-
- SDWebImage/Core (= 5.21.2)
2242-
- SDWebImage/Core (5.21.2)
2240+
- SDWebImage (5.21.3):
2241+
- SDWebImage/Core (= 5.21.3)
2242+
- SDWebImage/Core (5.21.3)
22432243
- SDWebImageAVIFCoder (0.11.1):
22442244
- libavif/core (>= 0.11.0)
22452245
- SDWebImage (~> 5.10)
@@ -2629,7 +2629,7 @@ SPEC CHECKSUMS:
26292629
RNScreens: 0d4cb9afe052607ad0aa71f645a88bb7c7f2e64c
26302630
RNSVG: 8ad5c94593e5e4a6e133e6934e2188e3c688d27a
26312631
RNVectorIcons: bd818296a51dc2bb8c3bd97a3ca399df1afe216d
2632-
SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
2632+
SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
26332633
SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
26342634
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
26352635
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748

0 commit comments

Comments
 (0)