Skip to content

Commit 1231c36

Browse files
feat: upgrade iOS Nav SDK to 10.10.0 and Android to 7.4.0 (#543)
Co-authored-by: Joonas Kerttula <joonas.kerttula@codemate.com>
1 parent 51a6a72 commit 1231c36

File tree

7 files changed

+19
-10
lines changed

7 files changed

+19
-10
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,22 @@ jobs:
189189
timeout-minutes: 45
190190
env:
191191
TURBO_CACHE_DIR: .turbo/ios
192+
# Fix github runner issues with xcode 26 toolchains
193+
# https://github.com/actions/runner-images/issues/13135#issuecomment-3722044150
192194
steps:
195+
- name: Set Xcode Toolchain
196+
shell: bash
197+
run: |
198+
echo "TOOLCHAINS=com.apple.dt.toolchain.XcodeDefault" >> $GITHUB_ENV
199+
193200
- name: Checkout
194201
uses: actions/checkout@v4
195202

196203
- name: Setup
197204
uses: ./.github/actions/setup
205+
206+
- name: Select XCode 26.3
207+
run: sudo xcode-select -s '/Applications/Xcode_26.3.0.app/Contents/Developer'
198208

199209
- name: Cache turborepo for iOS
200210
uses: actions/cache@v3

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ dependencies {
5858
implementation "androidx.car.app:app:1.4.0"
5959
implementation "androidx.car.app:app-projected:1.4.0"
6060
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
61-
implementation "com.google.android.libraries.navigation:navigation:7.3.0"
61+
implementation "com.google.android.libraries.navigation:navigation:7.4.0"
6262
api 'com.google.guava:guava:31.0.1-android'
6363
}

example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ dependencies {
153153
implementation "androidx.car.app:app-projected:1.4.0"
154154

155155
// Include the Google Navigation SDK.
156-
implementation 'com.google.android.libraries.navigation:navigation:7.3.0'
156+
implementation 'com.google.android.libraries.navigation:navigation:7.4.0'
157157
}
158158

159159
secrets {

example/e2e/shared.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ export const selectTestByName = async name => {
141141
await waitFor(targetElement).toBeVisible().withTimeout(5000);
142142
}
143143

144-
await iOSDelay(600);
144+
await iOSDelay(3000);
145145
await targetElement.tap();
146146
};

example/src/helpers/overlayModal.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ interface OverlayModalProps {
2323
closeOverlay: () => void;
2424
children: ReactNode;
2525
height?: number;
26+
contentPaddingBottom?: number;
2627
}
2728

2829
const OverlayModal: React.FC<OverlayModalProps> = ({
2930
visible,
3031
closeOverlay,
3132
children,
3233
height: height,
34+
contentPaddingBottom = 20,
3335
}) => {
3436
const modalContentStyle = [
3537
styles.modalContent,
@@ -51,9 +53,9 @@ const OverlayModal: React.FC<OverlayModalProps> = ({
5153
showsVerticalScrollIndicator={true}
5254
persistentScrollbar={true}
5355
style={styles.scrollContainer}
54-
contentContainerStyle={styles.scrollContentContainer}
56+
contentContainerStyle={{ paddingBottom: contentPaddingBottom }}
5557
>
56-
<View style={styles.scrollContent}>{children}</View>
58+
{children}
5759
</ScrollView>
5860
<View style={styles.closeButtonContainer}>
5961
<ExampleAppButton
@@ -94,10 +96,6 @@ const styles = StyleSheet.create({
9496
scrollContainer: {
9597
flex: 1,
9698
},
97-
scrollContentContainer: {
98-
paddingBottom: 20,
99-
},
100-
scrollContent: {},
10199
closeButtonContainer: {
102100
marginTop: 8,
103101
shadowColor: '#000',

example/src/screens/IntegrationTestsScreen.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ const IntegrationTestsScreen = () => {
367367
setIsOverlayOpen(false);
368368
}}
369369
height={overlayMinHeight}
370+
contentPaddingBottom={500}
370371
>
371372
<ExampleAppButton
372373
title="testNavigationSessionInitialization"

react-native-navigation-sdk.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
3535
s.public_header_files = "ios/**/*.h"
3636

3737
s.dependency "React-Core"
38-
s.dependency "GoogleNavigation", "10.7.0"
38+
s.dependency "GoogleNavigation", "10.10.0"
3939

4040
install_modules_dependencies(s)
4141
end

0 commit comments

Comments
 (0)