From ea62b653cb26df0b4e7d860e358cda673437f169 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 13:21:37 +0530 Subject: [PATCH 01/33] FIX: update mapbox navigation android to 2.17.8 --- android/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 181e82ce..0e9b0e3f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,10 +12,10 @@ // https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ -def DEFAULT_COMPILE_SDK_VERSION = 31 +def DEFAULT_COMPILE_SDK_VERSION = 30 def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' def DEFAULT_MIN_SDK_VERSION = 21 -def DEFAULT_TARGET_SDK_VERSION = 31 +def DEFAULT_TARGET_SDK_VERSION = 30 def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply plugin: 'maven' buildscript { - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.6.0' // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a // module dependency in an application project. @@ -96,7 +96,7 @@ repositories { dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules - implementation "com.mapbox.navigation:android:2.1.1" + implementation "com.mapbox.navigation:android:2.17.8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.cardview:cardview:1.0.0' From 693334fe9e1c6fa474a980a1260807e9bd9dcc78 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 13:33:05 +0530 Subject: [PATCH 02/33] FIX: updated compile and target sdk versions --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0e9b0e3f..42af5422 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,10 +12,10 @@ // https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ -def DEFAULT_COMPILE_SDK_VERSION = 30 +def DEFAULT_COMPILE_SDK_VERSION = 31 def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' def DEFAULT_MIN_SDK_VERSION = 21 -def DEFAULT_TARGET_SDK_VERSION = 30 +def DEFAULT_TARGET_SDK_VERSION = 31 def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback From 6ca38f374d3a18852ec3d3910ecb96c59017d520 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 13:54:17 +0530 Subject: [PATCH 03/33] FIX: updated gradlew --- android/build.gradle | 8 ++------ example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 42af5422..16f643b4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,10 +21,6 @@ def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven' - buildscript { ext.kotlin_version = '1.6.0' // The Android Gradle plugin is only required when opening the android folder stand-alone. @@ -37,7 +33,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:8.2.0' } } @@ -52,7 +48,7 @@ buildscript { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'maven' +apply plugin: 'maven-publish' android { compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 7665b0fa..b93c46a5 100755 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7e57549fc099d671e7c976520c550abf4249848c Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 14:00:28 +0530 Subject: [PATCH 04/33] FIX: compile -> implementation --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 16f643b4..4d4a1b64 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -125,7 +125,7 @@ afterEvaluate { project -> task androidJavadoc(type: Javadoc) { source = android.sourceSets.main.java.srcDirs classpath += files(android.bootClasspath) - classpath += files(project.getConfigurations().getByName('compile').asList()) + classpath += files(project.getConfigurations().getByName('implementation').asList()) include '**/*.java' } From 375e48d133ae3dbbe3691c51f47c46616d9ee67f Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 15:07:36 +0530 Subject: [PATCH 05/33] FIX: build gradlew --- android/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 4d4a1b64..ba13508c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -13,7 +13,7 @@ // https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ def DEFAULT_COMPILE_SDK_VERSION = 31 -def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' +def DEFAULT_BUILD_TOOLS_VERSION = '34.0.0' def DEFAULT_MIN_SDK_VERSION = 21 def DEFAULT_TARGET_SDK_VERSION = 31 @@ -51,6 +51,7 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { + namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) defaultConfig { @@ -125,7 +126,7 @@ afterEvaluate { project -> task androidJavadoc(type: Javadoc) { source = android.sourceSets.main.java.srcDirs classpath += files(android.bootClasspath) - classpath += files(project.getConfigurations().getByName('implementation').asList()) + classpath += files(android.sdkDirectory.toString() + '/platforms/android-' + android.compileSdkVersion + '/android.jar') include '**/*.java' } From 4a6cb33f31da85bce52ae05cda0727ae67a6d190 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 15:49:33 +0530 Subject: [PATCH 06/33] FIX: build gradlew file --- android/build.gradle | 141 ++++------ android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 61608 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/gradlew | 244 ++++++++++++++++++ android/gradlew.bat | 92 +++++++ 5 files changed, 398 insertions(+), 85 deletions(-) create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat diff --git a/android/build.gradle b/android/build.gradle index ba13508c..ae1e23ed 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,16 +1,6 @@ -// android/build.gradle - -// based on: -// -// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle -// original location: -// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle -// -// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle -// original location: -// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle - -// https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'maven-publish' def DEFAULT_COMPILE_SDK_VERSION = 31 def DEFAULT_BUILD_TOOLS_VERSION = '34.0.0' @@ -23,17 +13,13 @@ def safeExtGet(prop, fallback) { buildscript { ext.kotlin_version = '1.6.0' - // The Android Gradle plugin is only required when opening the android folder stand-alone. - // This avoids unnecessary downloads and potential conflicts when the library is included as a - // module dependency in an application project. - // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies if (project == rootProject) { repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:8.2.0' + classpath 'com.android.tools.build:gradle:8.0.0' } } @@ -46,119 +32,104 @@ buildscript { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' - android { namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) + defaultConfig { minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) versionCode 1 versionName "1.0" } + lintOptions { abortOnError false } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = "1.8" } + buildFeatures { viewBinding true } } repositories { - // ref: https://www.baeldung.com/maven-local-repository mavenLocal() - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$rootDir/../node_modules/react-native/android" - } - maven { - // Android JSC is installed from npm - url "$rootDir/../node_modules/jsc-android/dist" - } + maven { url "$rootDir/../node_modules/react-native/android" } + maven { url "$rootDir/../node_modules/jsc-android/dist" } google() jcenter() } dependencies { - //noinspection GradleDynamicVersion - implementation 'com.facebook.react:react-native:+' // From node_modules + implementation 'com.facebook.react:react-native:+' implementation "com.mapbox.navigation:android:2.17.8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.cardview:cardview:1.0.0' } -def configureReactNativePom(def pom) { +// Define the sourceJar task +task sourceJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + archiveClassifier.set('sources') +} + +// Function to configure POM file for Maven +def configurePom(pom) { def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - pom.project { - name packageJson.title - artifactId packageJson.name - version = packageJson.version - group = "com.homee.mapboxnavigation" - description packageJson.description - url packageJson.repository.baseUrl - - licenses { - license { - name packageJson.license - url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution 'repo' - } + pom.name = packageJson.title + pom.description = packageJson.description + pom.url = packageJson.repository.baseUrl + pom.licenses { + license { + name = packageJson.license + url = packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename + distribution = 'repo' } } } -afterEvaluate { project -> - // some Gradle build hooks ref: - // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html - task androidJavadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += files(android.bootClasspath) - classpath += files(android.sdkDirectory.toString() + '/platforms/android-' + android.compileSdkVersion + '/android.jar') - include '**/*.java' - } - - task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { - from androidJavadoc.destinationDir - } - - task androidSourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - include '**/*.java' - } - - android.libraryVariants.all { variant -> - def name = variant.name.capitalize() - def javaCompileTask = variant.javaCompileProvider.get() - - task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { - from javaCompileTask.destinationDir +publishing { + publications { + mavenAar(MavenPublication) { + groupId 'com.homee.mapboxnavigation' + artifactId 'mapboxnavigation' + version '1.0' + + // Specify the artifact to publish + artifact("$buildDir/outputs/aar/${project.name}-release.aar") + + // Include the source JAR in the publication + artifact sourceJar + + // Configure the POM file + pom.withXml { + def deps = asNode().appendNode('dependencies') + configurations.implementation.allDependencies.each { + def dep = deps.appendNode('dependency') + dep.appendNode('groupId', it.group) + dep.appendNode('artifactId', it.name) + dep.appendNode('version', it.version) + } + configurePom(asNode()) + } } } - artifacts { - archives androidSourcesJar - archives androidJavadocJar - } - - task installArchives(type: Upload) { - configuration = configurations.archives - repositories.mavenDeployer { - // Deploy to react-native-event-bridge/maven, ready to publish to npm - repository url: "file://${projectDir}/../android/maven" - configureReactNativePom pom + repositories { + maven { + url = uri("${buildDir}/repo") } } -} +} \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..ccebba7710deaf9f98673a68957ea02138b60d0a GIT binary patch literal 61608 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 literal 0 HcmV?d00001 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..42defcc9 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 00000000..79a61d42 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 00000000..6689b85b --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 9ef40102917519931316390979eade26f5813826 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 17:33:39 +0530 Subject: [PATCH 07/33] fix reverted back to old build gradle with nav update --- android/build.gradle | 148 ++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 58 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ae1e23ed..d1cecae0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,9 +1,19 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' +// android/build.gradle + +// based on: +// +// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle +// original location: +// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle +// +// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle +// original location: +// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle + +// https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ def DEFAULT_COMPILE_SDK_VERSION = 31 -def DEFAULT_BUILD_TOOLS_VERSION = '34.0.0' +def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' def DEFAULT_MIN_SDK_VERSION = 21 def DEFAULT_TARGET_SDK_VERSION = 31 @@ -11,15 +21,23 @@ def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'maven' + buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.5.21' + // The Android Gradle plugin is only required when opening the android folder stand-alone. + // This avoids unnecessary downloads and potential conflicts when the library is included as a + // module dependency in an application project. + // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies if (project == rootProject) { repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.0' + classpath 'com.android.tools.build:gradle:4.2.2' } } @@ -32,104 +50,118 @@ buildscript { } } +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'maven' + android { - namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) - defaultConfig { minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) versionCode 1 versionName "1.0" } - lintOptions { abortOnError false } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { jvmTarget = "1.8" } - buildFeatures { viewBinding true } } repositories { + // ref: https://www.baeldung.com/maven-local-repository mavenLocal() - maven { url "$rootDir/../node_modules/react-native/android" } - maven { url "$rootDir/../node_modules/jsc-android/dist" } + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url "$rootDir/../node_modules/react-native/android" + } + maven { + // Android JSC is installed from npm + url "$rootDir/../node_modules/jsc-android/dist" + } google() jcenter() } dependencies { - implementation 'com.facebook.react:react-native:+' + //noinspection GradleDynamicVersion + implementation 'com.facebook.react:react-native:+' // From node_modules implementation "com.mapbox.navigation:android:2.17.8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.cardview:cardview:1.0.0' } -// Define the sourceJar task -task sourceJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - archiveClassifier.set('sources') -} - -// Function to configure POM file for Maven -def configurePom(pom) { +def configureReactNativePom(def pom) { def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - pom.name = packageJson.title - pom.description = packageJson.description - pom.url = packageJson.repository.baseUrl - pom.licenses { - license { - name = packageJson.license - url = packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution = 'repo' + pom.project { + name packageJson.title + artifactId packageJson.name + version = packageJson.version + group = "com.homee.mapboxnavigation" + description packageJson.description + url packageJson.repository.baseUrl + + licenses { + license { + name packageJson.license + url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename + distribution 'repo' + } } } } -publishing { - publications { - mavenAar(MavenPublication) { - groupId 'com.homee.mapboxnavigation' - artifactId 'mapboxnavigation' - version '1.0' - - // Specify the artifact to publish - artifact("$buildDir/outputs/aar/${project.name}-release.aar") - - // Include the source JAR in the publication - artifact sourceJar - - // Configure the POM file - pom.withXml { - def deps = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dep = deps.appendNode('dependency') - dep.appendNode('groupId', it.group) - dep.appendNode('artifactId', it.name) - dep.appendNode('version', it.version) - } - configurePom(asNode()) - } +afterEvaluate { project -> + // some Gradle build hooks ref: + // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html + task androidJavadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += files(android.bootClasspath) + classpath += files(project.getConfigurations().getByName('compile').asList()) + include '**/*.java' + } + + task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { + from androidJavadoc.destinationDir + } + + task androidSourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + include '**/*.java' + } + + android.libraryVariants.all { variant -> + def name = variant.name.capitalize() + def javaCompileTask = variant.javaCompileProvider.get() + + task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { + from javaCompileTask.destinationDir } } - repositories { - maven { - url = uri("${buildDir}/repo") + artifacts { + archives androidSourcesJar + archives androidJavadocJar + } + + task installArchives(type: Upload) { + configuration = configurations.archives + repositories.mavenDeployer { + // Deploy to react-native-event-bridge/maven, ready to publish to npm + repository url: "file://${projectDir}/../android/maven" + configureReactNativePom pom } } } \ No newline at end of file From f143d8e3404e5300a34460266166e04e4ff1c26c Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 18:02:57 +0530 Subject: [PATCH 08/33] FIX: update build gradle --- android/build.gradle | 144 ++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 68 insertions(+), 78 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d1cecae0..3705d7b8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,11 +22,9 @@ def safeExtGet(prop, fallback) { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven' +apply plugin: 'maven-publish' buildscript { - ext.kotlin_version = '1.5.21' // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a // module dependency in an application project. @@ -37,24 +35,20 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:8.0.1' } } repositories { mavenCentral() } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven' +apply plugin: 'maven-publish' android { + namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) defaultConfig { @@ -70,9 +64,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" - } buildFeatures { viewBinding true } @@ -97,71 +88,70 @@ dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules implementation "com.mapbox.navigation:android:2.17.8" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.cardview:cardview:1.0.0' } -def configureReactNativePom(def pom) { - def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - - pom.project { - name packageJson.title - artifactId packageJson.name - version = packageJson.version - group = "com.homee.mapboxnavigation" - description packageJson.description - url packageJson.repository.baseUrl - - licenses { - license { - name packageJson.license - url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution 'repo' - } - } - } -} - -afterEvaluate { project -> - // some Gradle build hooks ref: - // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html - task androidJavadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += files(android.bootClasspath) - classpath += files(project.getConfigurations().getByName('compile').asList()) - include '**/*.java' - } - - task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { - from androidJavadoc.destinationDir - } - - task androidSourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - include '**/*.java' - } - - android.libraryVariants.all { variant -> - def name = variant.name.capitalize() - def javaCompileTask = variant.javaCompileProvider.get() - - task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { - from javaCompileTask.destinationDir - } - } - - artifacts { - archives androidSourcesJar - archives androidJavadocJar - } - - task installArchives(type: Upload) { - configuration = configurations.archives - repositories.mavenDeployer { - // Deploy to react-native-event-bridge/maven, ready to publish to npm - repository url: "file://${projectDir}/../android/maven" - configureReactNativePom pom - } - } -} \ No newline at end of file +// def configureReactNativePom(def pom) { +// def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) + +// pom.project { +// name packageJson.title +// artifactId packageJson.name +// version = packageJson.version +// group = "com.homee.mapboxnavigation" +// description packageJson.description +// url packageJson.repository.baseUrl + +// licenses { +// license { +// name packageJson.license +// url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename +// distribution 'repo' +// } +// } +// } +// } + +// afterEvaluate { project -> +// // some Gradle build hooks ref: +// // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html +// task androidJavadoc(type: Javadoc) { +// source = android.sourceSets.main.java.srcDirs +// classpath += files(android.bootClasspath) +// classpath += files(android.sdkDirectory.toString() + '/platforms/android-' + android.compileSdkVersion + '/android.jar') +// include '**/*.java' +// } + +// task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { +// from androidJavadoc.destinationDir +// } + +// task androidSourcesJar(type: Jar) { +// from android.sourceSets.main.java.srcDirs +// include '**/*.java' +// } + +// android.libraryVariants.all { variant -> +// def name = variant.name.capitalize() +// def javaCompileTask = variant.javaCompileProvider.get() + +// task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { +// from javaCompileTask.destinationDir +// } +// } + +// artifacts { +// archives androidSourcesJar +// archives androidJavadocJar +// } + +// task installArchives(type: Upload) { +// configuration = configurations.archives +// repositories.mavenDeployer { +// // Deploy to react-native-event-bridge/maven, ready to publish to npm +// repository url: "file://${projectDir}/../android/maven" +// configureReactNativePom pom +// } +// } +// } \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 42defcc9..fc10b601 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 50f26237250de9ec615cd19871fa022a1897e8a4 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Wed, 27 Dec 2023 19:05:37 +0530 Subject: [PATCH 09/33] FIX: upgraded gradle build --- android/build.gradle | 130 +++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3705d7b8..2a5bf690 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,3 +1,5 @@ +import groovy.json.JsonSlurper + // android/build.gradle // based on: @@ -22,9 +24,11 @@ def safeExtGet(prop, fallback) { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' apply plugin: 'maven-publish' buildscript { + ext.kotlin_version = '1.9.0' // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a // module dependency in an application project. @@ -32,7 +36,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:8.0.1' @@ -42,9 +46,14 @@ buildscript { repositories { mavenCentral() } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { @@ -64,6 +73,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = "1.8" + } buildFeatures { viewBinding true } @@ -81,77 +93,63 @@ repositories { url "$rootDir/../node_modules/jsc-android/dist" } google() - jcenter() + mavenCentral() } dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules implementation "com.mapbox.navigation:android:2.17.8" - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.cardview:cardview:1.0.0' } -// def configureReactNativePom(def pom) { -// def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - -// pom.project { -// name packageJson.title -// artifactId packageJson.name -// version = packageJson.version -// group = "com.homee.mapboxnavigation" -// description packageJson.description -// url packageJson.repository.baseUrl - -// licenses { -// license { -// name packageJson.license -// url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename -// distribution 'repo' -// } -// } -// } -// } - -// afterEvaluate { project -> -// // some Gradle build hooks ref: -// // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html -// task androidJavadoc(type: Javadoc) { -// source = android.sourceSets.main.java.srcDirs -// classpath += files(android.bootClasspath) -// classpath += files(android.sdkDirectory.toString() + '/platforms/android-' + android.compileSdkVersion + '/android.jar') -// include '**/*.java' -// } - -// task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { -// from androidJavadoc.destinationDir -// } - -// task androidSourcesJar(type: Jar) { -// from android.sourceSets.main.java.srcDirs -// include '**/*.java' -// } - -// android.libraryVariants.all { variant -> -// def name = variant.name.capitalize() -// def javaCompileTask = variant.javaCompileProvider.get() - -// task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { -// from javaCompileTask.destinationDir -// } -// } - -// artifacts { -// archives androidSourcesJar -// archives androidJavadocJar -// } - -// task installArchives(type: Upload) { -// configuration = configurations.archives -// repositories.mavenDeployer { -// // Deploy to react-native-event-bridge/maven, ready to publish to npm -// repository url: "file://${projectDir}/../android/maven" -// configureReactNativePom pom -// } -// } -// } \ No newline at end of file +def packageJson = new JsonSlurper().parseText(file('../package.json').text) + +publishing { + publications { + release(MavenPublication) { + from components.findByName('release') + + groupId = "com.homee.mapboxnavigation" + artifactId = packageJson.name + version = packageJson.version + + pom { + name = packageJson.title + description = packageJson.description + url = packageJson.repository.baseUrl + + licenses { + license { + name = packageJson.license + url = packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename + distribution = 'repo' + } + } + + } + } + } + + repositories { + maven { + url = uri("file://${projectDir}/../android/maven") + } + } +} + +afterEvaluate { project -> + + android.libraryVariants.configureEach { variant -> + def name = variant.name.capitalize() + def javaCompileTask = variant.javaCompileProvider.get() + + tasks.register("jar${name}", Jar) { + dependsOn javaCompileTask + from javaCompileTask.destinationDirectory + } + } + +} \ No newline at end of file From 9852ab3c7b57f3fd3fef7cdc903c8854ae0aaf17 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 5 Jan 2024 08:21:20 +0530 Subject: [PATCH 10/33] FIX: build gradlew --- android/build.gradle | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 2a5bf690..136da32a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -70,15 +70,27 @@ android { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures { viewBinding true } + packagingOptions { + pickFirst '**/armeabi-v7a/libc++_shared.so' + pickFirst '**/x86/libc++_shared.so' + pickFirst '**/arm64-v8a/libc++_shared.so' + pickFirst '**/x86_64/libc++_shared.so' + pickFirst '**/x86/libc++_shared.so' + pickFirst '**/armeabi-v7a/libmapbox-maps.so' + pickFirst '**/x86/libmapbox-maps.so' + pickFirst '**/arm64-v8a/libmapbox-maps.so' + pickFirst '**/x86_64/libmapbox-maps.so' + pickFirst '**/x86/libmapbox-maps.so' + } } repositories { From f7d5933e669030d825ed53f941b1265e13429e1d Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 5 Jan 2024 10:16:49 +0530 Subject: [PATCH 11/33] fix: update build gradlew --- android/build.gradle | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 136da32a..3a34069f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,10 +14,11 @@ import groovy.json.JsonSlurper // https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ -def DEFAULT_COMPILE_SDK_VERSION = 31 -def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' +def DEFAULT_COMPILE_SDK_VERSION = 33 +def DEFAULT_BUILD_TOOLS_VERSION = '33.0.0' def DEFAULT_MIN_SDK_VERSION = 21 -def DEFAULT_TARGET_SDK_VERSION = 31 +def DEFAULT_TARGET_SDK_VERSION = 33 +def DEFAULT_NDK_VERSION = "23.1.7779620" def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback @@ -57,9 +58,18 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { + packagingOptions { + pickFirst 'lib/x86/libc++_shared.so' + pickFirst 'lib/x86_64/libc++_shared.so' + pickFirst 'lib/arm64-v8a/libc++_shared.so' + pickFirst 'lib/armeabi-v7a/libc++_shared.so' + } + namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) + ndkVersion safeExtGet('ndkVersion', DEFAULT_NDK_VERSION) + defaultConfig { minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) From 0bae6e107e133b220b4a9bc7fce93ad8a18d6856 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 5 Jan 2024 12:39:05 +0530 Subject: [PATCH 12/33] FIX: build gradle --- android/build.gradle | 122 ++++++++++++------------------------------- 1 file changed, 32 insertions(+), 90 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3a34069f..03301466 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,24 +1,9 @@ import groovy.json.JsonSlurper -// android/build.gradle - -// based on: -// -// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle -// original location: -// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle -// -// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle -// original location: -// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle - -// https://www.cognizantsoftvision.com/blog/creating-an-android-native-module-for-react-native/ - def DEFAULT_COMPILE_SDK_VERSION = 33 -def DEFAULT_BUILD_TOOLS_VERSION = '33.0.0' -def DEFAULT_MIN_SDK_VERSION = 21 +def DEFAULT_BUILD_TOOLS_VERSION = '31.0.0' +def DEFAULT_MIN_SDK_VERSION = 24 def DEFAULT_TARGET_SDK_VERSION = 33 -def DEFAULT_NDK_VERSION = "23.1.7779620" def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback @@ -29,7 +14,7 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' buildscript { - ext.kotlin_version = '1.9.0' + ext.kotlin_version = '1.6.20' // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a // module dependency in an application project. @@ -37,10 +22,10 @@ buildscript { if (project == rootProject) { repositories { google() - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:3.4.1' } } @@ -58,18 +43,8 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { - packagingOptions { - pickFirst 'lib/x86/libc++_shared.so' - pickFirst 'lib/x86_64/libc++_shared.so' - pickFirst 'lib/arm64-v8a/libc++_shared.so' - pickFirst 'lib/armeabi-v7a/libc++_shared.so' - } - - namespace 'com.homee.mapboxnavigation' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) - ndkVersion safeExtGet('ndkVersion', DEFAULT_NDK_VERSION) - defaultConfig { minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) @@ -80,26 +55,11 @@ android { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "17" - } - buildFeatures { - viewBinding true - } - packagingOptions { - pickFirst '**/armeabi-v7a/libc++_shared.so' - pickFirst '**/x86/libc++_shared.so' - pickFirst '**/arm64-v8a/libc++_shared.so' - pickFirst '**/x86_64/libc++_shared.so' - pickFirst '**/x86/libc++_shared.so' - pickFirst '**/armeabi-v7a/libmapbox-maps.so' - pickFirst '**/x86/libmapbox-maps.so' - pickFirst '**/arm64-v8a/libmapbox-maps.so' - pickFirst '**/x86_64/libmapbox-maps.so' - pickFirst '**/x86/libmapbox-maps.so' + jvmTarget = "1.8" } } @@ -115,63 +75,45 @@ repositories { url "$rootDir/../node_modules/jsc-android/dist" } google() - mavenCentral() + jcenter() } dependencies { //noinspection GradleDynamicVersion - implementation 'com.facebook.react:react-native:+' // From node_modules - implementation "com.mapbox.navigation:android:2.17.8" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.facebook.react:react-native:+' // From node_modules + implementation 'com.mapbox.navigation:core:1.5.0' + implementation 'com.mapbox.navigation:ui:1.5.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } -def packageJson = new JsonSlurper().parseText(file('../package.json').text) - -publishing { - publications { - release(MavenPublication) { - from components.findByName('release') - - groupId = "com.homee.mapboxnavigation" - artifactId = packageJson.name - version = packageJson.version - - pom { - name = packageJson.title - description = packageJson.description - url = packageJson.repository.baseUrl - - licenses { - license { - name = packageJson.license - url = packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution = 'repo' - } - } - +def configureReactNativePom(def pom) { +def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) + + pom.project { + name packageJson.title + artifactId packageJson.name + version = packageJson.version + group = "com.homee.mapboxnavigation" + description packageJson.description + url packageJson.repository.baseUrl + + licenses { + license { + name packageJson.license + url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename + distribution 'repo' } } } - - repositories { - maven { - url = uri("file://${projectDir}/../android/maven") - } - } } afterEvaluate { project -> - - android.libraryVariants.configureEach { variant -> + android.libraryVariants.all { variant -> def name = variant.name.capitalize() def javaCompileTask = variant.javaCompileProvider.get() - tasks.register("jar${name}", Jar) { - dependsOn javaCompileTask - from javaCompileTask.destinationDirectory + task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { + from javaCompileTask.destinationDir } } - } \ No newline at end of file From 91cdaf7cf13c939f669a7aa7863e9fc71163c517 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 5 Jan 2024 14:22:04 +0530 Subject: [PATCH 13/33] Fix: update --- android/build.gradle | 174 ++++++++---------- .../MapboxNavigationManager.kt | 119 ++++++------ .../MapboxNavigationPackage.kt | 15 +- 3 files changed, 141 insertions(+), 167 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 03301466..70dd430f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,119 +1,99 @@ -import groovy.json.JsonSlurper +buildscript { + // Buildscript is evaluated before everything else so we can't use getExtOrDefault + def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["MapboxNavigation_kotlinVersion"] -def DEFAULT_COMPILE_SDK_VERSION = 33 -def DEFAULT_BUILD_TOOLS_VERSION = '31.0.0' -def DEFAULT_MIN_SDK_VERSION = 24 -def DEFAULT_TARGET_SDK_VERSION = 33 + repositories { + google() + mavenCentral() + } -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback + dependencies { + classpath "com.android.tools.build:gradle:7.2.2" + // noinspection DifferentKotlinGradleVersion + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' +def isNewArchitectureEnabled() { + return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true" +} -buildscript { - ext.kotlin_version = '1.6.20' - // The Android Gradle plugin is only required when opening the android folder stand-alone. - // This avoids unnecessary downloads and potential conflicts when the library is included as a - // module dependency in an application project. - // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies - if (project == rootProject) { - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' - } - } +apply plugin: "com.android.library" +apply plugin: "kotlin-android" - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } +def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') } + +if (isNewArchitectureEnabled()) { + apply plugin: "com.facebook.react" +} + +def getExtOrDefault(name) { + return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["MapboxNavigation_" + name] } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' +def getExtOrIntegerDefault(name) { + return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["MapboxNavigation_" + name]).toInteger() +} android { - compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) - buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) - defaultConfig { - minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) - targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) - versionCode 1 - versionName "1.0" - } - lintOptions { - abortOnError false - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" + compileSdkVersion getExtOrIntegerDefault("compileSdkVersion") + + defaultConfig { + minSdkVersion getExtOrIntegerDefault("minSdkVersion") + targetSdkVersion getExtOrIntegerDefault("targetSdkVersion") + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() + } + buildTypes { + release { + minifyEnabled false } + } + + lintOptions { + disable "GradleCompatible" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + // Add the block below if you're using Kotlin + kotlinOptions { + jvmTarget = "1.8" + } + + buildFeatures { + viewBinding true + } + } repositories { - // ref: https://www.baeldung.com/maven-local-repository - mavenLocal() - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$rootDir/../node_modules/react-native/android" - } - maven { - // Android JSC is installed from npm - url "$rootDir/../node_modules/jsc-android/dist" - } - google() - jcenter() + mavenCentral() + google() } +def kotlin_version = getExtOrDefault("kotlinVersion") + dependencies { - //noinspection GradleDynamicVersion - implementation 'com.facebook.react:react-native:+' // From node_modules - implementation 'com.mapbox.navigation:core:1.5.0' - implementation 'com.mapbox.navigation:ui:1.5.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} + // For < 0.71, this will be from the local maven repo + // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:+" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" -def configureReactNativePom(def pom) { -def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - - pom.project { - name packageJson.title - artifactId packageJson.name - version = packageJson.version - group = "com.homee.mapboxnavigation" - description packageJson.description - url packageJson.repository.baseUrl - - licenses { - license { - name packageJson.license - url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution 'repo' - } - } - } + // mapbox dependencies + implementation "com.mapbox.navigation:android:2.17.8" + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.cardview:cardview:1.0.0' } -afterEvaluate { project -> - android.libraryVariants.all { variant -> - def name = variant.name.capitalize() - def javaCompileTask = variant.javaCompileProvider.get() - - task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { - from javaCompileTask.destinationDir - } - } +if (isNewArchitectureEnabled()) { + react { + jsRootDir = file("../src/") + libraryName = "MapboxNavigationView" + codegenJavaPackageName = "com.homee.mapboxnavigation" + } } \ No newline at end of file diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 03823a5a..d1476c71 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -13,77 +13,74 @@ import com.mapbox.maps.TileStoreUsageMode import javax.annotation.Nonnull class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : SimpleViewManager() { - private var accessToken: String? = null - - init { - mCallerContext.runOnUiQueueThread { - try { - val app = mCallerContext.packageManager.getApplicationInfo(mCallerContext.packageName, PackageManager.GET_META_DATA) - val bundle = app.metaData - val accessToken = bundle.getString("MAPBOX_ACCESS_TOKEN") - this.accessToken = accessToken - ResourceOptionsManager.getDefault(mCallerContext, accessToken).update { - tileStoreUsageMode(TileStoreUsageMode.READ_ONLY) - } - } catch (e: PackageManager.NameNotFoundException) { - e.printStackTrace() - } + private var accessToken: String? = null + init { + mCallerContext.runOnUiQueueThread { + try { + val app = mCallerContext.packageManager.getApplicationInfo(mCallerContext.packageName, PackageManager.GET_META_DATA) + val bundle = app.metaData + val accessToken = bundle.getString("MAPBOX_ACCESS_TOKEN") + this.accessToken = accessToken + ResourceOptionsManager.getDefault(mCallerContext, accessToken).update { + tileStoreUsageMode(TileStoreUsageMode.READ_ONLY) } + } catch (e: PackageManager.NameNotFoundException) { + e.printStackTrace() + } } + } + override fun getName(): String = "MapboxNavigation" - override fun getName(): String { - return "MapboxNavigation" - } + public override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): MapboxNavigationView { + return MapboxNavigationView(reactContext, this.accessToken) + } - public override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): MapboxNavigationView { - return MapboxNavigationView(reactContext, this.accessToken) - } + override fun onDropViewInstance(view: MapboxNavigationView) { + view.onDropViewInstance() + super.onDropViewInstance(view) + } - override fun onDropViewInstance(view: MapboxNavigationView) { - view.onDropViewInstance() - super.onDropViewInstance(view) - } + override fun getExportedCustomDirectEventTypeConstants(): MutableMap>? { + return MapBuilder.of>( + "onLocationChange", MapBuilder.of("registrationName", "onLocationChange"), + "onError", MapBuilder.of("registrationName", "onError"), + "onCancelNavigation", MapBuilder.of("registrationName", "onCancelNavigation"), + "onArrive", MapBuilder.of("registrationName", "onArrive"), + "onRouteProgressChange", MapBuilder.of("registrationName", "onRouteProgressChange"), + ) + } - override fun getExportedCustomDirectEventTypeConstants(): MutableMap>? { - return MapBuilder.of>( - "onLocationChange", MapBuilder.of("registrationName", "onLocationChange"), - "onError", MapBuilder.of("registrationName", "onError"), - "onCancelNavigation", MapBuilder.of("registrationName", "onCancelNavigation"), - "onArrive", MapBuilder.of("registrationName", "onArrive"), - "onRouteProgressChange", MapBuilder.of("registrationName", "onRouteProgressChange"), - ) + @ReactProp(name = "origin") + fun setOrigin(view: MapboxNavigationView, sources: ReadableArray?) { + if (sources == null) { + view.setOrigin(null) + return } + view.setOrigin(Point.fromLngLat(sources.getDouble(0), sources.getDouble(1))) + } - @ReactProp(name = "origin") - fun setOrigin(view: MapboxNavigationView, sources: ReadableArray?) { - if (sources == null) { - view.setOrigin(null) - return - } - view.setOrigin(Point.fromLngLat(sources.getDouble(0), sources.getDouble(1))) + @ReactProp(name = "destination") + fun setDestination(view: MapboxNavigationView, sources: ReadableArray?) { + if (sources == null) { + view.setDestination(null) + return } + view.setDestination(Point.fromLngLat(sources.getDouble(0), sources.getDouble(1))) + } - @ReactProp(name = "destination") - fun setDestination(view: MapboxNavigationView, sources: ReadableArray?) { - if (sources == null) { - view.setDestination(null) - return - } - view.setDestination(Point.fromLngLat(sources.getDouble(0), sources.getDouble(1))) - } + @ReactProp(name = "shouldSimulateRoute") + fun setShouldSimulateRoute(view: MapboxNavigationView, shouldSimulateRoute: Boolean) { + view.setShouldSimulateRoute(shouldSimulateRoute) + } - @ReactProp(name = "shouldSimulateRoute") - fun setShouldSimulateRoute(view: MapboxNavigationView, shouldSimulateRoute: Boolean) { - view.setShouldSimulateRoute(shouldSimulateRoute) - } + @ReactProp(name = "showsEndOfRouteFeedback") + fun setShowsEndOfRouteFeedback(view: MapboxNavigationView, showsEndOfRouteFeedback: Boolean) { + view.setShowsEndOfRouteFeedback(showsEndOfRouteFeedback) + } - @ReactProp(name = "showsEndOfRouteFeedback") - fun setShowsEndOfRouteFeedback(view: MapboxNavigationView, showsEndOfRouteFeedback: Boolean) { - view.setShowsEndOfRouteFeedback(showsEndOfRouteFeedback) - } + @ReactProp(name = "mute") + fun setMute(view: MapboxNavigationView, mute: Boolean) { + view.setMute(mute) + } - @ReactProp(name = "mute") - fun setMute(view: MapboxNavigationView, mute: Boolean) { - view.setMute(mute) - } -} +} \ No newline at end of file diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationPackage.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationPackage.kt index 4f8c5503..5358ed75 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationPackage.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationPackage.kt @@ -4,16 +4,13 @@ import com.facebook.react.ReactPackage import com.facebook.react.bridge.NativeModule import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager -import java.util.* class MapboxNavigationPackage : ReactPackage { - override fun createNativeModules(reactContext: ReactApplicationContext): List { - return emptyList() - } + override fun createNativeModules(reactContext: ReactApplicationContext): List { + return emptyList() + } - override fun createViewManagers(reactContext: ReactApplicationContext): List> { - return Arrays.asList>( - MapboxNavigationManager(reactContext) - ) - } + override fun createViewManagers(reactContext: ReactApplicationContext): List> { + return listOf(MapboxNavigationManager(reactContext)) + } } \ No newline at end of file From 1cb1894398d68aab842b8a75db081f4b0e20f574 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 5 Jan 2024 16:30:25 +0530 Subject: [PATCH 14/33] fix: add ndk version --- android/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 70dd430f..7f1ca86c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,11 +37,13 @@ def getExtOrIntegerDefault(name) { } android { + compileSdkVersion getExtOrIntegerDefault("compileSdkVersion") defaultConfig { minSdkVersion getExtOrIntegerDefault("minSdkVersion") targetSdkVersion getExtOrIntegerDefault("targetSdkVersion") + ndkVersion "23.1.7779620" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() } buildTypes { From d0866f57c2bf363ab43f17568b699b1125f199ca Mon Sep 17 00:00:00 2001 From: saraff22 Date: Thu, 11 Jan 2024 19:27:46 +0530 Subject: [PATCH 15/33] FEAT: add waypoints --- android/build.gradle | 2 -- .../MapboxNavigationManager.kt | 18 ++++++++++++++++++ .../mapboxnavigation/MapboxNavigationView.kt | 19 +++++++++++++++---- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 7f1ca86c..70dd430f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,13 +37,11 @@ def getExtOrIntegerDefault(name) { } android { - compileSdkVersion getExtOrIntegerDefault("compileSdkVersion") defaultConfig { minSdkVersion getExtOrIntegerDefault("minSdkVersion") targetSdkVersion getExtOrIntegerDefault("targetSdkVersion") - ndkVersion "23.1.7779620" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() } buildTypes { diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index d1476c71..29aade07 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -83,4 +83,22 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim view.setMute(mute) } + @ReactProp(name = "waypoints") + fun setWaypoints(view: MapboxNavigationView, waypointsArray: ReadableArray?) { + waypointsArray?.let { + val waypoints = mutableListOf() + for (i in 0 until it.size()) { + val waypointArray = it.getArray(i) + if (waypointArray != null && waypointArray.size() >= 2) { + val longitude = waypointArray.getDouble(0) + val latitude = waypointArray.getDouble(1) + waypoints.add(Point.fromLngLat(longitude, latitude)) + } + } + + view.setWaypoints(waypoints) + } + } + + } \ No newline at end of file diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt index a4d41818..b8062d00 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt @@ -87,6 +87,7 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val } private var origin: Point? = null + private var waypoints: List? = null private var destination: Point? = null private var shouldSimulateRoute = false private var showsEndOfRouteFeedback = false @@ -627,7 +628,13 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val mapboxNavigation.registerVoiceInstructionsObserver(voiceInstructionsObserver) mapboxNavigation.registerRouteProgressObserver(replayProgressObserver) - this.origin?.let { this.destination?.let { it1 -> this.findRoute(it, it1) } } + // Create a list of coordinates that includes origin, destination, and waypoints + val coordinatesList = mutableListOf() + this.origin?.let { coordinatesList.add(it) } + this.waypoints?.let { coordinatesList.addAll(it) } + this.destination?.let { coordinatesList.add(it) } + + findRoute(coordinatesList) } override fun onDetachedFromWindow() { @@ -649,13 +656,13 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val voiceInstructionsPlayer.shutdown() } - private fun findRoute(origin: Point, destination: Point) { + private fun findRoute(coordinates: List) { try { mapboxNavigation.requestRoutes( RouteOptions.builder() .applyDefaultNavigationOptions() .applyLanguageAndVoiceUnitOptions(context) - .coordinatesList(listOf(origin, destination)) + .coordinatesList(coordinates) .profile(DirectionsCriteria.PROFILE_DRIVING) .steps(true) .build(), @@ -749,6 +756,10 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val this.origin = origin } + fun setWaypoints(waypoints: List) { + this.waypoints = waypoints + } + fun setDestination(destination: Point?) { this.destination = destination } @@ -764,4 +775,4 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val fun setMute(mute: Boolean) { this.isVoiceInstructionsMuted = mute } -} +} \ No newline at end of file From 941d5be5c817171f6a3e6470aca5c833af671f78 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Thu, 11 Jan 2024 19:33:33 +0530 Subject: [PATCH 16/33] FIX: waypoints type --- src/typings.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/typings.ts b/src/typings.ts index 91c5cd0b..dbb98620 100644 --- a/src/typings.ts +++ b/src/typings.ts @@ -37,4 +37,5 @@ export interface IMapboxNavigationProps { showsEndOfRouteFeedback?: boolean; hideStatusView?: boolean; mute?: boolean; + waypoints: Coordinate[]; } From 29b563b456ee49ac5bfca50eeb90dbe36da9d0f3 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Thu, 11 Jan 2024 19:40:50 +0530 Subject: [PATCH 17/33] FIX: waypoints typings.d.ts --- dist/typings.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/typings.d.ts b/dist/typings.d.ts index fd3c038b..a5a95389 100644 --- a/dist/typings.d.ts +++ b/dist/typings.d.ts @@ -33,5 +33,6 @@ export interface IMapboxNavigationProps { showsEndOfRouteFeedback?: boolean; hideStatusView?: boolean; mute?: boolean; + waypoints: Coordinate[]; } export {}; From 8051c98799ecd16a5ce5919f3ae828637023d27d Mon Sep 17 00:00:00 2001 From: saraff22 Date: Fri, 12 Jan 2024 21:50:13 +0530 Subject: [PATCH 18/33] FIX: updated mapbox nav ios --- react-native-mapbox-navigation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-mapbox-navigation.podspec b/react-native-mapbox-navigation.podspec index 387ebc41..c4793b11 100644 --- a/react-native-mapbox-navigation.podspec +++ b/react-native-mapbox-navigation.podspec @@ -46,6 +46,6 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency "React-Core" - s.dependency "MapboxNavigation", "~> 2.1.1" + s.dependency "MapboxNavigation", "~> 2.17.0" end From ada8b9b7a83f2eea3bf3e50e100dd90933a5278a Mon Sep 17 00:00:00 2001 From: saraff22 Date: Sat, 13 Jan 2024 09:00:01 +0530 Subject: [PATCH 19/33] FIX: ios change minimum deployment target --- react-native-mapbox-navigation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-mapbox-navigation.podspec b/react-native-mapbox-navigation.podspec index c4793b11..4d42b3b5 100644 --- a/react-native-mapbox-navigation.podspec +++ b/react-native-mapbox-navigation.podspec @@ -39,7 +39,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/homeeondemand/react-native-mapbox-navigation" s.license = { :type => "MIT", :file => "LICENSE" } s.authors = { "HOMEE" => "support@homee.com" } - s.platforms = { :ios => "11.0" } + s.platforms = { :ios => "12.4" } s.source = { :git => "https://github.com/homeeondemand/react-native-mapbox-navigation.git", :tag => "#{s.version}" } s.source_files = "ios/**/*.{h,m,swift}" From 0171d936042da533b3083d26ef0edb3cce9947e3 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Thu, 25 Jan 2024 09:28:55 +0530 Subject: [PATCH 20/33] FEAT: allow waypoints in ios --- example/android/gradle.properties | 3 ++- example/ios/BasicApp.xcodeproj/project.pbxproj | 4 ++-- example/ios/Podfile.lock | 8 ++++---- ios/MapboxNavigationManager.m | 1 + ios/MapboxNavigationView.swift | 17 +++++++++++++++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 8ceae6b9..60834c3a 100755 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -32,4 +32,5 @@ MAPBOX_DOWNLOADS_TOKEN= sk.eyJ1Ijoiam9yZ2VxdWV2ZWRveCIsImEiOiJja29ib3oycWIyN2Z3M org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError org.gradle.daemon=true org.gradle.parallel=true -org.gradle.configureondemand=true. \ No newline at end of file +org.gradle.configureondemand=true. +MapboxNavigation_kotlinVersion=1.6.10 \ No newline at end of file diff --git a/example/ios/BasicApp.xcodeproj/project.pbxproj b/example/ios/BasicApp.xcodeproj/project.pbxproj index 33137a91..f6d33fb2 100644 --- a/example/ios/BasicApp.xcodeproj/project.pbxproj +++ b/example/ios/BasicApp.xcodeproj/project.pbxproj @@ -564,7 +564,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -629,7 +629,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 39778c91..109f6ac3 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -235,8 +235,8 @@ PODS: - React-jsinspector (0.66.4) - React-logger (0.66.4): - glog - - react-native-mapbox-navigation (1.1.0): - - MapboxNavigation (~> 2.1.0) + - react-native-mapbox-navigation (2.0.1): + - MapboxNavigation (~> 2.1.1) - React-Core - React-perflogger (0.66.4) - React-RCTActionSheet (0.66.4): @@ -451,7 +451,7 @@ SPEC CHECKSUMS: React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396 React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85 React-logger: 933f80c97c633ee8965d609876848148e3fef438 - react-native-mapbox-navigation: 0966e03abd15664a2255a40f315c91e109a8a054 + react-native-mapbox-navigation: 04e8379f8a2d308e5a292bdbc3a79ac883e2d1d4 React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89 React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13 @@ -470,4 +470,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: b825e0c0c2130ea0c4924baa443a786ab3686731 -COCOAPODS: 1.11.2 +COCOAPODS: 1.14.3 diff --git a/ios/MapboxNavigationManager.m b/ios/MapboxNavigationManager.m index 7e4c8f1f..47f9cdca 100644 --- a/ios/MapboxNavigationManager.m +++ b/ios/MapboxNavigationManager.m @@ -13,5 +13,6 @@ @interface RCT_EXTERN_MODULE(MapboxNavigationManager, RCTViewManager) RCT_EXPORT_VIEW_PROPERTY(showsEndOfRouteFeedback, BOOL) RCT_EXPORT_VIEW_PROPERTY(hideStatusView, BOOL) RCT_EXPORT_VIEW_PROPERTY(mute, BOOL) +RCT_EXPORT_VIEW_PROPERTY(waypoints, NSArray) @end diff --git a/ios/MapboxNavigationView.swift b/ios/MapboxNavigationView.swift index aa361521..783af58d 100644 --- a/ios/MapboxNavigationView.swift +++ b/ios/MapboxNavigationView.swift @@ -24,6 +24,10 @@ class MapboxNavigationView: UIView, NavigationViewControllerDelegate { @objc var origin: NSArray = [] { didSet { setNeedsLayout() } } + + @objc var waypoints: NSArray = [] { + didSet { setNeedsLayout() } + } @objc var destination: NSArray = [] { didSet { setNeedsLayout() } @@ -74,6 +78,19 @@ class MapboxNavigationView: UIView, NavigationViewControllerDelegate { let originWaypoint = Waypoint(coordinate: CLLocationCoordinate2D(latitude: origin[1] as! CLLocationDegrees, longitude: origin[0] as! CLLocationDegrees)) let destinationWaypoint = Waypoint(coordinate: CLLocationCoordinate2D(latitude: destination[1] as! CLLocationDegrees, longitude: destination[0] as! CLLocationDegrees)) + var waypointsArray = [originWaypoint] + + // Adding intermediate waypoints if any + for waypointArray in waypoints { + if let waypointCoordinates = waypointArray as? NSArray, waypointCoordinates.count == 2, + let lat = waypointCoordinates[1] as? CLLocationDegrees, let lon = waypointCoordinates[0] as? CLLocationDegrees { + let waypoint = Waypoint(coordinate: CLLocationCoordinate2D(latitude: lat, longitude: lon)) + waypointsArray.append(waypoint) + } + } + + waypointsArray.append(destinationWaypoint) + // let options = NavigationRouteOptions(waypoints: [originWaypoint, destinationWaypoint]) let options = NavigationRouteOptions(waypoints: [originWaypoint, destinationWaypoint], profileIdentifier: .automobileAvoidingTraffic) From aa3d07fc657e7a6ff9f25703cd418f624a56f8e4 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 17:15:01 +0530 Subject: [PATCH 21/33] FEAT: add vehicle maxWeight and vehicle maxWidth in android --- .../MapboxNavigationManager.kt | 10 ++++ .../mapboxnavigation/MapboxNavigationView.kt | 30 ++++++++--- dist/typings.d.ts | 52 ++++++++++--------- src/typings.ts | 4 +- 4 files changed, 63 insertions(+), 33 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 29aade07..882e4596 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -100,5 +100,15 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } } + @ReactProp(name = "vehicleMaxHeight") + fun setMaxHeight(view: MapboxNavigationView, maxHeight: Double?) { + view.setMaxHeight(vehicleMaxHeight) + } + + @ReactProp(name = "vehicleMaxWidth") + fun setMaxWidth(view: MapboxNavigationView, maxWidth: Double?) { + view.setMaxWidth(vehicleMaxWidth) + } + } \ No newline at end of file diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt index b8062d00..f84539e3 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt @@ -91,6 +91,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val private var destination: Point? = null private var shouldSimulateRoute = false private var showsEndOfRouteFeedback = false + private var vehicleMaxHeight: Double? = null + private var vehicleMaxWidth: Double? = null /** * Debug tool used to play, pause and seek route progress events that can be used to produce mocked location updates along the route. */ @@ -658,14 +660,20 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val private fun findRoute(coordinates: List) { try { + val routeOptionsBuilder = RouteOptions.builder() + .applyDefaultNavigationOptions() + .applyLanguageAndVoiceUnitOptions(context) + .coordinatesList(coordinates) + .profile(DirectionsCriteria.PROFILE_DRIVING) + .steps(true) + + vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it) } + vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it) } + + val routeOptions = routeOptionsBuilder.build() + mapboxNavigation.requestRoutes( - RouteOptions.builder() - .applyDefaultNavigationOptions() - .applyLanguageAndVoiceUnitOptions(context) - .coordinatesList(coordinates) - .profile(DirectionsCriteria.PROFILE_DRIVING) - .steps(true) - .build(), + routeOptions, object : RouterCallback { override fun onRoutesReady( routes: List, @@ -775,4 +783,12 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val fun setMute(mute: Boolean) { this.isVoiceInstructionsMuted = mute } + + fun setMaxHeight(vehicleMaxHeight: Double?) { + this.vehicleMaxHeight = vehicleMaxHeight + } + + fun setMaxWidth(vehicleMaxWidth: Double?) { + this.vehicleMaxWidth = vehicleMaxWidth + } } \ No newline at end of file diff --git a/dist/typings.d.ts b/dist/typings.d.ts index a5a95389..8e8d2ed8 100644 --- a/dist/typings.d.ts +++ b/dist/typings.d.ts @@ -3,36 +3,38 @@ */ declare type Coordinate = [number, number]; declare type OnLocationChangeEvent = { - nativeEvent?: { - latitude: number; - longitude: number; - }; + nativeEvent?: { + latitude: number; + longitude: number; + }; }; declare type OnRouteProgressChangeEvent = { - nativeEvent?: { - distanceTraveled: number; - durationRemaining: number; - fractionTraveled: number; - distanceRemaining: number; - }; + nativeEvent?: { + distanceTraveled: number; + durationRemaining: number; + fractionTraveled: number; + distanceRemaining: number; + }; }; declare type OnErrorEvent = { - nativeEvent?: { - message?: string; - }; + nativeEvent?: { + message?: string; + }; }; export interface IMapboxNavigationProps { - origin: Coordinate; - destination: Coordinate; - shouldSimulateRoute?: boolean; - onLocationChange?: (event: OnLocationChangeEvent) => void; - onRouteProgressChange?: (event: OnRouteProgressChangeEvent) => void; - onError?: (event: OnErrorEvent) => void; - onCancelNavigation?: () => void; - onArrive?: () => void; - showsEndOfRouteFeedback?: boolean; - hideStatusView?: boolean; - mute?: boolean; - waypoints: Coordinate[]; + origin: Coordinate; + destination: Coordinate; + shouldSimulateRoute?: boolean; + onLocationChange?: (event: OnLocationChangeEvent) => void; + onRouteProgressChange?: (event: OnRouteProgressChangeEvent) => void; + onError?: (event: OnErrorEvent) => void; + onCancelNavigation?: () => void; + onArrive?: () => void; + showsEndOfRouteFeedback?: boolean; + hideStatusView?: boolean; + mute?: boolean; + waypoints?: Coordinate[]; + vehicleMaxHeight?: number; + vehicleMaxWidth?: number; } export {}; diff --git a/src/typings.ts b/src/typings.ts index dbb98620..19ced945 100644 --- a/src/typings.ts +++ b/src/typings.ts @@ -37,5 +37,7 @@ export interface IMapboxNavigationProps { showsEndOfRouteFeedback?: boolean; hideStatusView?: boolean; mute?: boolean; - waypoints: Coordinate[]; + waypoints?: Coordinate[]; + vehicleMaxHeight?: number; + vehicleMaxWidth?: number; } From 96b4e7b110b11662af0881206571b8ff6505538f Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 17:23:10 +0530 Subject: [PATCH 22/33] FEAT: vehicle width height options in ios --- ios/MapboxNavigationManager.m | 2 ++ ios/MapboxNavigationView.swift | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/ios/MapboxNavigationManager.m b/ios/MapboxNavigationManager.m index 47f9cdca..b18c5c7c 100644 --- a/ios/MapboxNavigationManager.m +++ b/ios/MapboxNavigationManager.m @@ -14,5 +14,7 @@ @interface RCT_EXTERN_MODULE(MapboxNavigationManager, RCTViewManager) RCT_EXPORT_VIEW_PROPERTY(hideStatusView, BOOL) RCT_EXPORT_VIEW_PROPERTY(mute, BOOL) RCT_EXPORT_VIEW_PROPERTY(waypoints, NSArray) +RCT_EXPORT_VIEW_PROPERTY(vehicleMaxHeight, NSNumber) +RCT_EXPORT_VIEW_PROPERTY(vehicleMaxWidth, NSNumber) @end diff --git a/ios/MapboxNavigationView.swift b/ios/MapboxNavigationView.swift index 783af58d..7ea058f9 100644 --- a/ios/MapboxNavigationView.swift +++ b/ios/MapboxNavigationView.swift @@ -43,6 +43,8 @@ class MapboxNavigationView: UIView, NavigationViewControllerDelegate { @objc var onError: RCTDirectEventBlock? @objc var onCancelNavigation: RCTDirectEventBlock? @objc var onArrive: RCTDirectEventBlock? + @objc var vehicleMaxHeight: NSNumber? + @objc var vehicleMaxWidth: NSNumber? override init(frame: CGRect) { self.embedded = false @@ -94,6 +96,14 @@ class MapboxNavigationView: UIView, NavigationViewControllerDelegate { // let options = NavigationRouteOptions(waypoints: [originWaypoint, destinationWaypoint]) let options = NavigationRouteOptions(waypoints: [originWaypoint, destinationWaypoint], profileIdentifier: .automobileAvoidingTraffic) + if let vehicleMaxHeight = vehicleMaxHeight?.doubleValue { + options.includesMaxHeightOnMostRestrictiveBridge = true + options.maxHeight = vehicleMaxHeight + } + if let vehicleMaxWidth = vehicleMaxWidth?.doubleValue { + options.maxWidth = vehicleMaxWidth + } + Directions.shared.calculate(options) { [weak self] (_, result) in guard let strongSelf = self, let parentVC = strongSelf.parentViewController else { return From e8239d7e95a99f7ac52c8c208a5f1d46d0e64623 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 17:53:14 +0530 Subject: [PATCH 23/33] FIX: vehicle options typo --- .../com/homee/mapboxnavigation/MapboxNavigationManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 882e4596..1949a2a2 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -101,12 +101,12 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } @ReactProp(name = "vehicleMaxHeight") - fun setMaxHeight(view: MapboxNavigationView, maxHeight: Double?) { + fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Double?) { view.setMaxHeight(vehicleMaxHeight) } @ReactProp(name = "vehicleMaxWidth") - fun setMaxWidth(view: MapboxNavigationView, maxWidth: Double?) { + fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Double?) { view.setMaxWidth(vehicleMaxWidth) } From af494edb2d3f5942d8b60863f187b6e4d4d01b71 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 18:38:17 +0530 Subject: [PATCH 24/33] FIX: double type in android --- .../mapboxnavigation/MapboxNavigationManager.kt | 6 +++--- .../homee/mapboxnavigation/MapboxNavigationView.kt | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 1949a2a2..66bc9fa2 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -89,7 +89,7 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim val waypoints = mutableListOf() for (i in 0 until it.size()) { val waypointArray = it.getArray(i) - if (waypointArray != null && waypointArray.size() >= 2) { + if (waypointArray && waypointArray.size() >= 2) { val longitude = waypointArray.getDouble(0) val latitude = waypointArray.getDouble(1) waypoints.add(Point.fromLngLat(longitude, latitude)) @@ -101,12 +101,12 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } @ReactProp(name = "vehicleMaxHeight") - fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Double?) { + fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Float?) { view.setMaxHeight(vehicleMaxHeight) } @ReactProp(name = "vehicleMaxWidth") - fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Double?) { + fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Float?) { view.setMaxWidth(vehicleMaxWidth) } diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt index f84539e3..a087614d 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt @@ -91,8 +91,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val private var destination: Point? = null private var shouldSimulateRoute = false private var showsEndOfRouteFeedback = false - private var vehicleMaxHeight: Double? = null - private var vehicleMaxWidth: Double? = null + private var vehicleMaxHeight: Float? = null + private var vehicleMaxWidth: Float? = null /** * Debug tool used to play, pause and seek route progress events that can be used to produce mocked location updates along the route. */ @@ -667,8 +667,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val .profile(DirectionsCriteria.PROFILE_DRIVING) .steps(true) - vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it) } - vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it) } + vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it.toDouble()) } + vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it.toDouble()) } val routeOptions = routeOptionsBuilder.build() @@ -784,11 +784,11 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val this.isVoiceInstructionsMuted = mute } - fun setMaxHeight(vehicleMaxHeight: Double?) { + fun setMaxHeight(vehicleMaxHeight: Float?) { this.vehicleMaxHeight = vehicleMaxHeight } - fun setMaxWidth(vehicleMaxWidth: Double?) { + fun setMaxWidth(vehicleMaxWidth: Float?) { this.vehicleMaxWidth = vehicleMaxWidth } } \ No newline at end of file From 4edc2386844f579062c0697a1dd3694cc4316f6d Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 18:51:27 +0530 Subject: [PATCH 25/33] FIX: null check waypoints --- .../java/com/homee/mapboxnavigation/MapboxNavigationManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 66bc9fa2..23e534c4 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -89,7 +89,7 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim val waypoints = mutableListOf() for (i in 0 until it.size()) { val waypointArray = it.getArray(i) - if (waypointArray && waypointArray.size() >= 2) { + if (waypointArray !== null && waypointArray.size() >= 2) { val longitude = waypointArray.getDouble(0) val latitude = waypointArray.getDouble(1) waypoints.add(Point.fromLngLat(longitude, latitude)) From 38eb1608aecbf72dc8c505460dfc502a635508cf Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 19:05:27 +0530 Subject: [PATCH 26/33] FIX : float to double --- .../mapboxnavigation/MapboxNavigationManager.kt | 4 ++-- .../homee/mapboxnavigation/MapboxNavigationView.kt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 23e534c4..00c4f32c 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -101,12 +101,12 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } @ReactProp(name = "vehicleMaxHeight") - fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Float?) { + fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Double?) { view.setMaxHeight(vehicleMaxHeight) } @ReactProp(name = "vehicleMaxWidth") - fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Float?) { + fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Double?) { view.setMaxWidth(vehicleMaxWidth) } diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt index a087614d..f84539e3 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt @@ -91,8 +91,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val private var destination: Point? = null private var shouldSimulateRoute = false private var showsEndOfRouteFeedback = false - private var vehicleMaxHeight: Float? = null - private var vehicleMaxWidth: Float? = null + private var vehicleMaxHeight: Double? = null + private var vehicleMaxWidth: Double? = null /** * Debug tool used to play, pause and seek route progress events that can be used to produce mocked location updates along the route. */ @@ -667,8 +667,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val .profile(DirectionsCriteria.PROFILE_DRIVING) .steps(true) - vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it.toDouble()) } - vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it.toDouble()) } + vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it) } + vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it) } val routeOptions = routeOptionsBuilder.build() @@ -784,11 +784,11 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val this.isVoiceInstructionsMuted = mute } - fun setMaxHeight(vehicleMaxHeight: Float?) { + fun setMaxHeight(vehicleMaxHeight: Double?) { this.vehicleMaxHeight = vehicleMaxHeight } - fun setMaxWidth(vehicleMaxWidth: Float?) { + fun setMaxWidth(vehicleMaxWidth: Double?) { this.vehicleMaxWidth = vehicleMaxWidth } } \ No newline at end of file From cbb524c5ab51d57d7921c8b9a1f7eb5f3f177341 Mon Sep 17 00:00:00 2001 From: saraff22 Date: Mon, 29 Jan 2024 19:21:36 +0530 Subject: [PATCH 27/33] FIX: change pro fix android --- .../mapboxnavigation/MapboxNavigationManager.kt | 8 ++++---- .../mapboxnavigation/MapboxNavigationView.kt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index 00c4f32c..b1504eba 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -101,13 +101,13 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } @ReactProp(name = "vehicleMaxHeight") - fun setMaxHeight(view: MapboxNavigationView, vehicleMaxHeight: Double?) { - view.setMaxHeight(vehicleMaxHeight) + fun setMaxHeight(view: MapboxNavigationView, maxHeight: Double?) { + view.setMaxHeight(maxHeight) } @ReactProp(name = "vehicleMaxWidth") - fun setMaxWidth(view: MapboxNavigationView, vehicleMaxWidth: Double?) { - view.setMaxWidth(vehicleMaxWidth) + fun setMaxWidth(view: MapboxNavigationView, maxWidth: Double?) { + view.setMaxWidth(maxWidth) } diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt index f84539e3..0da01ae5 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationView.kt @@ -91,8 +91,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val private var destination: Point? = null private var shouldSimulateRoute = false private var showsEndOfRouteFeedback = false - private var vehicleMaxHeight: Double? = null - private var vehicleMaxWidth: Double? = null + private var maxHeight: Double? = null + private var maxWidth: Double? = null /** * Debug tool used to play, pause and seek route progress events that can be used to produce mocked location updates along the route. */ @@ -667,8 +667,8 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val .profile(DirectionsCriteria.PROFILE_DRIVING) .steps(true) - vehicleMaxHeight?.let { routeOptionsBuilder.maxHeight(it) } - vehicleMaxWidth?.let { routeOptionsBuilder.maxWidth(it) } + maxHeight?.let { routeOptionsBuilder.maxHeight(it) } + maxWidth?.let { routeOptionsBuilder.maxWidth(it) } val routeOptions = routeOptionsBuilder.build() @@ -784,11 +784,11 @@ class MapboxNavigationView(private val context: ThemedReactContext, private val this.isVoiceInstructionsMuted = mute } - fun setMaxHeight(vehicleMaxHeight: Double?) { - this.vehicleMaxHeight = vehicleMaxHeight + fun setMaxHeight(maxHeight: Double?) { + this.maxHeight = maxHeight } - fun setMaxWidth(vehicleMaxWidth: Double?) { - this.vehicleMaxWidth = vehicleMaxWidth + fun setMaxWidth(maxWidth: Double?) { + this.maxWidth = maxWidth } } \ No newline at end of file From eea3582836748753575872f5d36c2a0d4951b8c4 Mon Sep 17 00:00:00 2001 From: saraf22 Date: Mon, 12 Feb 2024 09:20:51 +0530 Subject: [PATCH 28/33] FIX: android layout --- android/gradle.properties | 4 ++++ android/gradle/wrapper/gradle-wrapper.properties | 3 ++- android/src/main/res/layout/navigation_view.xml | 9 ++++----- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 android/gradle.properties diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..03b0acc8 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,4 @@ +MapboxNavigation_kotlinVersion=1.6.0 +MapboxNavigation_compileSdkVersion=33 +MapboxNavigation_minSdkVersion=21 +MapboxNavigation_targetSdkVersion=33 \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index fc10b601..46549df2 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Mon Feb 12 09:11:13 IST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/src/main/res/layout/navigation_view.xml b/android/src/main/res/layout/navigation_view.xml index a3d68a9e..acad2f8e 100644 --- a/android/src/main/res/layout/navigation_view.xml +++ b/android/src/main/res/layout/navigation_view.xml @@ -26,10 +26,9 @@ + android:layout_gravity="left" /> + app:srcCompat="@android:drawable/ic_delete" + app:tint="@android:color/darker_gray" /> Date: Mon, 12 Feb 2024 09:55:58 +0530 Subject: [PATCH 29/33] FIX: android layout --- android/src/main/res/layout/navigation_view.xml | 8 +++++--- example/android/gradle.properties | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/android/src/main/res/layout/navigation_view.xml b/android/src/main/res/layout/navigation_view.xml index acad2f8e..d8629aaf 100644 --- a/android/src/main/res/layout/navigation_view.xml +++ b/android/src/main/res/layout/navigation_view.xml @@ -26,15 +26,17 @@ + android:layout_gravity="fill|left" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" /> diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 60834c3a..8ceae6b9 100755 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -32,5 +32,4 @@ MAPBOX_DOWNLOADS_TOKEN= sk.eyJ1Ijoiam9yZ2VxdWV2ZWRveCIsImEiOiJja29ib3oycWIyN2Z3M org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError org.gradle.daemon=true org.gradle.parallel=true -org.gradle.configureondemand=true. -MapboxNavigation_kotlinVersion=1.6.10 \ No newline at end of file +org.gradle.configureondemand=true. \ No newline at end of file From 51856882e59bd10343a9d8676d72f1b421dd15ad Mon Sep 17 00:00:00 2001 From: saraf22 Date: Mon, 12 Feb 2024 11:35:36 +0530 Subject: [PATCH 30/33] FEAT: change vehicle height weight type android --- .../MapboxNavigationManager.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt index b1504eba..f88caeda 100644 --- a/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt +++ b/android/src/main/java/com/homee/mapboxnavigation/MapboxNavigationManager.kt @@ -101,13 +101,21 @@ class MapboxNavigationManager(var mCallerContext: ReactApplicationContext) : Sim } @ReactProp(name = "vehicleMaxHeight") - fun setMaxHeight(view: MapboxNavigationView, maxHeight: Double?) { - view.setMaxHeight(maxHeight) + fun setMaxHeight(view: MapboxNavigationView, height: Int?) { + if (height == null) { + view.setMaxHeight(1.6) + return + } + view.setMaxHeight(height?.toDouble()) } - + @ReactProp(name = "vehicleMaxWidth") - fun setMaxWidth(view: MapboxNavigationView, maxWidth: Double?) { - view.setMaxWidth(maxWidth) + fun setMaxWidth(view: MapboxNavigationView, width: Int?) { + if (width == null) { + view.setMaxWidth(1.9) + return + } + view.setMaxWidth(width?.toDouble()) } From 6f962458f735720b3ba353f1115acfc934e418f7 Mon Sep 17 00:00:00 2001 From: Sarafathulla S <32380446+sarafhbk@users.noreply.github.com> Date: Tue, 13 Feb 2024 22:10:51 +0530 Subject: [PATCH 31/33] Update README.md --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 8e6d0bf9..d62831e3 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,11 @@ Array that contains the longitude and latitude for the starting point.
Array that contains the longitude and latitude for the destination point.
`[$longitude, $latitude]` +#### `waypoints` + +Array that contains arrays of longitude and latitude for the waypoints (limit 25 as per the MapBox restrictions).
+`[[$longitude, $latitude], [$longitude, $latitude]]` + #### `shouldSimulateRoute` Boolean that controls route simulation. Set this as `true` to auto navigate which is useful for testing or demo purposes. Defaults to `false`. @@ -311,6 +316,18 @@ Boolean that toggles voice instructions. Defaults to `false`. Boolean that controls showing the `StatusView` (iOS only). This is the transparent black bar with the "Simulating Navigation" text shown in the above screenshot. Defaults to `false`. +#### `vehicleMaxWidth` + +Number that sets max width (in meters) of the vehicle. Defaults to `1.6`. + +#### `vehicleMaxHeight` + +Number that sets max height (in meters) of the vehicle. Defaults to `1.9`. + +#### `mute` + +Boolean that toggles voice instructions. Defaults to `false`. + #### `onLocationChange` Function that is called frequently during route navigation. It receives `latitude` and `longitude` as parameters that represent the current location during navigation. From bcf6a974c7e8e9c8450044720553e775112a4a03 Mon Sep 17 00:00:00 2001 From: saraf22 Date: Thu, 2 May 2024 08:10:45 +0530 Subject: [PATCH 32/33] FEAT: update mapbox navigation sdk --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 70dd430f..a386ad59 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -85,7 +85,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" // mapbox dependencies - implementation "com.mapbox.navigation:android:2.17.8" + implementation "com.mapbox.navigation:android:2.19.0" implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.cardview:cardview:1.0.0' } From 2061c9bce762b855c1355805c335819e816631c5 Mon Sep 17 00:00:00 2001 From: saraf22 Date: Tue, 7 May 2024 22:20:08 +0530 Subject: [PATCH 33/33] FIX: upgrade java version --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a386ad59..0d5e44b9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -55,13 +55,13 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } // Add the block below if you're using Kotlin kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures {