Skip to content

Commit cdd7b68

Browse files
feat: update navigation sdk versions (iOS -> 9.1.2, Android -> 6.0.0) and min iOS version to 15 (#306)
1 parent 6674a4f commit cdd7b68

File tree

12 files changed

+20
-19
lines changed

12 files changed

+20
-19
lines changed

CARPLAY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This guide explains how to enable and integrate Apple CarPlay with the React Nat
44

55
## Requirements
66

7-
- iOS device or iOS simulator (iOS 14.0+)
7+
- iOS device or iOS simulator (iOS 15.0+)
88
- CarPlay Simulator
99
- CarPlay entitlement for your application (provided by Apple)
1010

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains a React Native plugin that provides a [Google Navigatio
1111

1212
| | Android | iOS |
1313
| ------------------------------- | ------- | --------- |
14-
| **Minimum mobile OS supported** | SDK 23+ | iOS 14.0+ |
14+
| **Minimum mobile OS supported** | SDK 23+ | iOS 15.0+ |
1515

1616
* A React Native project
1717
* A Google Cloud project

android/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
import groovy.json.JsonSlurper
1616

1717
buildscript {
18+
ext.kotlin_version = '2.0.0'
1819
repositories {
1920
google()
2021
mavenCentral()
2122
}
2223

2324
dependencies {
24-
classpath("com.android.tools.build:gradle:7.2.1")
25+
classpath("com.android.tools.build:gradle:8.4.0")
26+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2527
}
2628
}
2729

@@ -76,6 +78,6 @@ dependencies {
7678
implementation 'com.facebook.react:react-native:+'
7779
implementation 'com.android.support:multidex:1.0.3'
7880
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
79-
implementation "com.google.android.libraries.navigation:navigation:5.3.1"
81+
implementation "com.google.android.libraries.navigation:navigation:6.0.0"
8082
api 'com.google.guava:guava:31.0.1-android'
8183
}

example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ dependencies {
131131
// For Android Auto Sample support
132132
implementation "androidx.car.app:app:1.4.0"
133133
implementation "androidx.car.app:app-projected:1.4.0"
134-
implementation 'com.google.android.libraries.navigation:navigation:5.3.1'
134+
implementation 'com.google.android.libraries.navigation:navigation:6.0.0'
135135
}
136136

137137
secrets {

example/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright 2023 Google LLC
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ buildscript {
2525
mavenCentral()
2626
}
2727
dependencies {
28-
classpath("com.android.tools.build:gradle:7.2.1")
28+
classpath('com.android.tools.build:gradle:8.4.0')
2929
classpath("com.facebook.react:react-native-gradle-plugin")
3030
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
3131
}

example/ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ end
1010
node_require('react-native/scripts/react_native_pods.rb')
1111
node_require('react-native-permissions/scripts/setup.rb')
1212

13-
platform :ios, "14.0"
13+
platform :ios, "15.0"
1414
prepare_react_native_project!
1515

1616
setup_permissions([
@@ -55,4 +55,4 @@ post_install do |installer|
5555
config[:reactNativePath],
5656
:mac_catalyst_enabled => false
5757
)
58-
end
58+
end

example/ios/SampleApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1414
29F89EA4FF546EABE968E1D2 /* libPods-SampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 354226CC8A58229ECC025410 /* libPods-SampleApp.a */; };
1515
2A20E8122C8994DB00DB7ADA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
16-
2A20E8142C8994DB00DB7ADA /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
16+
2A20E8142C8994DB00DB7ADA /* (null) in Frameworks */ = {isa = PBXBuildFile; };
1717
2A20E8282C899A1400DB7ADA /* Info-CarPlay.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info-CarPlay.plist */; };
1818
2AB8C27A2C89A07000250560 /* Keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52D4271C2C81D3F300C7FB36 /* Keys.plist */; };
1919
2AB8C27E2C89A0B400250560 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
@@ -96,7 +96,7 @@
9696
isa = PBXFrameworksBuildPhase;
9797
buildActionMask = 2147483647;
9898
files = (
99-
2A20E8142C8994DB00DB7ADA /* BuildFile in Frameworks */,
99+
2A20E8142C8994DB00DB7ADA /* (null) in Frameworks */,
100100
29F89EA4FF546EABE968E1D2 /* libPods-SampleApp.a in Frameworks */,
101101
);
102102
runOnlyForDeploymentPostprocessing = 0;
@@ -946,7 +946,7 @@
946946
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
947947
GCC_WARN_UNUSED_FUNCTION = YES;
948948
GCC_WARN_UNUSED_VARIABLE = YES;
949-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
949+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
950950
LD = "";
951951
LDPLUSPLUS = "";
952952
LD_RUNPATH_SEARCH_PATHS = (

example/ios/SampleApp/AppDelegate.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ - (BOOL)application:(UIApplication *)application
3636
NSString *api_key = [keysDictionary objectForKey:@"API_KEY"];
3737

3838
[GMSServices provideAPIKey:api_key];
39-
[GMSServices setMetalRendererEnabled:YES];
4039
return [super application:application didFinishLaunchingWithOptions:launchOptions];
4140
}
4241

example/ios/SampleApp/AppDelegateCarPlay.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ - (BOOL)application:(UIApplication *)application
3737
NSString *api_key = [keysDictionary objectForKey:@"API_KEY"];
3838

3939
[GMSServices provideAPIKey:api_key];
40-
[GMSServices setMetalRendererEnabled:YES];
4140
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
4241
self.rootView = [[RCTRootView alloc] initWithBridge:bridge
4342
moduleName:self.moduleName

example/src/controls/mapsControls.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const MapsControls: React.FC<MapControlsProps> = ({ mapViewController }) => {
7777
case 2:
7878
return MapType.SATELLITE;
7979
case 3:
80+
/** MapType.TERRAIN does not work during navigation. */
8081
return MapType.TERRAIN;
8182
case 4:
8283
return MapType.HYBRID;

0 commit comments

Comments
 (0)