Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ def safeExtGet(prop, fallback) {
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.facebook.react'

android {
Expand All @@ -40,9 +39,9 @@ android {
}
}

lintOptions {
abortOnError false
disable "GradleCompatible"
lint {
abortOnError = false
disable += "GradleCompatible"
}

sourceSets {
Expand All @@ -61,7 +60,7 @@ repositories {
}

dependencies {
implementation 'com.google.android.libraries.mapsplatform.transportation:transportation-driver:7.0.0'
implementation 'com.google.android.libraries.mapsplatform.transportation:transportation-driver:7.1.0'
implementation 'androidx.startup:startup-runtime:1.2.0'
implementation 'com.facebook.react:react-native:+'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
Expand Down
2 changes: 1 addition & 1 deletion example/LMFS/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ android {
// see https://reactnative.dev/docs/signed-apk-android.
signingConfig signingConfigs.debug
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}
compileOptions {
Expand Down
8 changes: 4 additions & 4 deletions example/LMFS/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ buildscript {
compileSdkVersion = 36
targetSdkVersion = 36
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
kotlinVersion = "2.3.0"
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle")
classpath("com.android.tools.build:gradle:9.2.1")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
}
}
Expand Down Expand Up @@ -63,7 +63,7 @@ allprojects {

dependencies {
// Desugar Java 8+ APIs
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions example/LMFS/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Transitional compatibility for native dependencies that still apply KGP.
android.builtInKotlin=false
android.newDsl=false

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 12 additions & 2 deletions example/LMFS/ios/SampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -592,16 +592,21 @@
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = "$(inherited)";
PODFILE_DIR = "$(SRCROOT)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -666,16 +671,21 @@
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = "$(inherited)";
PODFILE_DIR = "$(SRCROOT)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
26 changes: 13 additions & 13 deletions example/LMFS/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
"build:ios": "react-native build-ios --mode Debug"
},
"dependencies": {
"@googlemaps/react-native-navigation-sdk": "^0.16.0",
"@react-navigation/native": "^6.1.18",
"@react-navigation/stack": "^6.4.1",
"react": "19.1.0",
"react-native": "0.83.1",
"@googlemaps/react-native-navigation-sdk": "0.17.0",
"@react-navigation/native": "7.3.18",
"@react-navigation/stack": "7.10.24",
"react": "19.2.3",
"react-native": "0.87.1",
"react-native-dotenv": "^3.4.11",
"react-native-gesture-handler": "2.29.1",
"react-native-permissions": "^5.1.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-screens": "4.15.4",
"react-native-gesture-handler": "3.2.1",
"react-native-permissions": "5.6.1",
"react-native-safe-area-context": "5.9.1",
"react-native-screens": "4.27.0",
"react-native-select-dropdown": "^4.0.1",
"react-native-snackbar": "^2.8.0"
"react-native-snackbar": "3.0.1"
},
"devDependencies": {
"@babel/core": "^7.26.0",
Expand All @@ -32,9 +32,9 @@
"@react-native-community/cli": "20.0.0",
"@react-native-community/cli-platform-android": "20.0.0",
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/babel-preset": "0.83.1",
"@react-native/metro-config": "0.83.1",
"@react-native/typescript-config": "0.83.1",
"@react-native/babel-preset": "0.87.1",
"@react-native/metro-config": "0.87.1",
"@react-native/typescript-config": "0.87.1",
"@types/node": "^22.9.0",
"@types/react-native-dotenv": "^0.2.2",
"babel-plugin-module-resolver": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion example/LMFS/src/checkPermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
requestMultiple,
RESULTS,
} from 'react-native-permissions';
import Snackbar from 'react-native-snackbar';
import { Snackbar } from 'react-native-snackbar';

const usePermissions = () => {
const [arePermissionsApproved, setArePermissionsApproved] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion example/ODRD/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ android {
// see https://reactnative.dev/docs/signed-apk-android.
signingConfig signingConfigs.debug
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}
compileOptions {
Expand Down
8 changes: 4 additions & 4 deletions example/ODRD/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ buildscript {
compileSdkVersion = 36
targetSdkVersion = 36
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
kotlinVersion = "2.3.0"
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle")
classpath("com.android.tools.build:gradle:9.2.1")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
}
}
Expand Down Expand Up @@ -63,7 +63,7 @@ allprojects {

dependencies {
// Desugar Java 8+ APIs
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions example/ODRD/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Transitional compatibility for native dependencies that still apply KGP.
android.builtInKotlin=false
android.newDsl=false

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 7 additions & 0 deletions example/ODRD/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ target 'SampleApp' do
# Fix fmt compilation issue with Xcode 26+ (stricter consteval enforcement)
# Fixed in React Native 0.85+, can be removed after upgrading.
installer.pods_project.targets.each do |target|
# Align this pod's legacy minimum with the app for current Xcode SDKs.
if target.name == 'react-native-safe-area-context'
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
end
end

if target.name == 'fmt'
target.build_configurations.each do |config|
config.build_settings['CLANG_CXX_LANGUAGE_STANDARD'] = 'c++17'
Expand Down
14 changes: 12 additions & 2 deletions example/ODRD/ios/SampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -592,16 +592,21 @@
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = "$(inherited)";
PODFILE_DIR = "$(SRCROOT)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -666,16 +671,21 @@
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
"-DRCT_REMOVE_LEGACY_ARCH=1",
);
OTHER_LDFLAGS = "$(inherited)";
PODFILE_DIR = "$(SRCROOT)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
26 changes: 13 additions & 13 deletions example/ODRD/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
"build:ios": "react-native build-ios --mode Debug"
},
"dependencies": {
"@googlemaps/react-native-navigation-sdk": "^0.16.0",
"@react-navigation/native": "^6.1.18",
"@react-navigation/stack": "^6.4.1",
"react": "19.1.0",
"react-native": "0.83.1",
"@googlemaps/react-native-navigation-sdk": "0.17.0",
"@react-navigation/native": "7.3.18",
"@react-navigation/stack": "7.10.24",
"react": "19.2.3",
"react-native": "0.87.1",
"react-native-dotenv": "^3.4.11",
"react-native-gesture-handler": "2.29.1",
"react-native-permissions": "^5.1.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-screens": "4.15.4",
"react-native-gesture-handler": "3.2.1",
"react-native-permissions": "5.6.1",
"react-native-safe-area-context": "5.9.1",
"react-native-screens": "4.27.0",
"react-native-select-dropdown": "^4.0.1",
"react-native-snackbar": "^2.8.0"
"react-native-snackbar": "3.0.1"
},
"devDependencies": {
"@babel/core": "^7.26.0",
Expand All @@ -32,9 +32,9 @@
"@react-native-community/cli": "20.0.0",
"@react-native-community/cli-platform-android": "20.0.0",
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/babel-preset": "0.83.1",
"@react-native/metro-config": "0.83.1",
"@react-native/typescript-config": "0.83.1",
"@react-native/babel-preset": "0.87.1",
"@react-native/metro-config": "0.87.1",
"@react-native/typescript-config": "0.87.1",
"@types/node": "^22.9.0",
"@types/react-native-dotenv": "^0.2.2",
"babel-plugin-module-resolver": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion example/ODRD/src/checkPermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
requestMultiple,
RESULTS,
} from 'react-native-permissions';
import Snackbar from 'react-native-snackbar';
import { Snackbar } from 'react-native-snackbar';

const usePermissions = () => {
const [arePermissionsApproved, setArePermissionsApproved] = useState(false);
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,14 @@
"build": "bob build"
},
"dependencies": {
"@googlemaps/react-native-navigation-sdk": "^0.16.0"
"@googlemaps/react-native-navigation-sdk": "0.17.0"
},
"devDependencies": {
"@commitlint/config-conventional": "^19.2.2",
"@evilmartians/lefthook": "^1.5.0",
"@react-native/babel-preset": "^0.83.1",
"@react-native/typescript-config": "^0.83.1",
"@react-native/babel-preset": "0.87.1",
"@react-native/jest-preset": "0.87.1",
"@react-native/typescript-config": "0.87.1",
"@testing-library/react-native": "^13.3.3",
"@types/jest": "^29.5.5",
"@types/react": "19.2.0",
Expand All @@ -83,10 +84,10 @@
"eslint-plugin-testing-library": "^6.2.2",
"jest": "^29.7.0",
"prettier": "^3.6.2",
"react": "19.2.0",
"react-native": "0.83.1",
"react": "19.2.3",
"react-native": "0.87.1",
"react-native-builder-bob": "^0.40.13",
"react-test-renderer": "19.2.0",
"react-test-renderer": "19.2.3",
"turbo": "^1.10.7",
"typescript": "^5.8.3"
},
Expand All @@ -100,7 +101,7 @@
],
"packageManager": "yarn@3.6.4",
"jest": {
"preset": "react-native",
"preset": "@react-native/jest-preset",
"modulePathIgnorePatterns": [
"<rootDir>/example/LMFS/node_modules",
"<rootDir>/example/ODRD/node_modules",
Expand Down
1 change: 1 addition & 0 deletions scripts/addlicense.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ addlicense -f header_template.txt $@ \
--ignore "**/android/**/.cxx/**" \
--ignore "**/android/.gradle/**" \
--ignore "**/android/.idea/**" \
--ignore ".idea/**" \
--ignore "**/ios/build/**" \
--ignore "example/**/vendor/**" \
--ignore "lib/**" \
Expand Down
Loading
Loading