fix: update ios/android

Author: PiotrStevDeveloper

.gitignore

@@ -62,3 +62,5 @@ lib/
 # example app build files
 example/android/app/src/main/assets/index.android.bundle
 example/android/app/src/main/res/raw/app.json
+.yarn/*
+example/.yarn/*

android/build.gradle

@@ -6,7 +6,9 @@ buildscript {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.2'
+          classpath("com.android.tools.build:gradle")
+          classpath("com.facebook.react:react-native-gradle-plugin")
+          classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
         }
     }
 }
@@ -18,8 +20,9 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('TelematicsSdk_compileSdkVersion', 33)
-    buildToolsVersion safeExtGet('TelematicsSdk_buildToolsVersion', '33.0.1')
+  namespace "com.reactnativetelematicssdk"
+    compileSdkVersion safeExtGet('TelematicsSdk_compileSdkVersion', 34)
+    buildToolsVersion safeExtGet('TelematicsSdk_buildToolsVersion', '34.0.0')
     defaultConfig {
         minSdkVersion safeExtGet('TelematicsSdk_minSdkVersion', 21)
         targetSdkVersion safeExtGet('TelematicsSdk_targetSdkVersion', 33)
@@ -44,38 +47,22 @@ android {
 
 rootProject.allprojects {
     repositories {
-       mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-        google()
-        maven {
+      google()
+      mavenCentral()
+      maven {
+        url "https://repo1.maven.org/maven2/"
+      }
+      maven {
             url "https://s3.us-east-2.amazonaws.com/android.telematics.sdk.production/"
         }
+
     }
 }
 
-repositories {
-    mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
 
-}
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation "com.telematicssdk:tracking:2.2.257"  // Telematics sdk
+    implementation("com.facebook.react:react-android:0.73.0")
+    implementation "com.telematicssdk:tracking:2.2.260"  // Telematics sdk
 }

android/gradle.properties

@@ -0,0 +1,41 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew <task> -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+# If set to false, you will be using JSC instead.
+hermesEnabled=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+

android/settings.gradle

@@ -0,0 +1,2 @@
+
+includeBuild('../node_modules/@react-native/gradle-plugin')

android/src/main/java/com/reactnativetelematicssdk/TelematicsSdkModule.java

@@ -8,18 +8,20 @@
 
 import androidx.annotation.NonNull;
 
-import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
+import java.util.Map;
+import java.util.HashMap;
 
 import com.raxeltelematics.v2.sdk.TrackingApi;
 import com.raxeltelematics.v2.sdk.Settings;
 import com.raxeltelematics.v2.sdk.utils.permissions.PermissionsWizardActivity;
 
-@ReactModule(name = TelematicsSdkModule.NAME)
+
 public class TelematicsSdkModule extends ReactContextBaseJavaModule implements PreferenceManager.OnActivityResultListener {
   public static final String NAME = "TelematicsSdk";
   private static final String TAG = "TelematicsSdkModule";

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
 };

example/android/app/build.gradle

@@ -82,7 +82,7 @@ android {
         applicationId "com.example.reactnativetelematicssdk"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
+        versionCode 11
         versionName "1.0"
     }
     signingConfigs {

example/android/build.gradle

@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "34.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 33
-        targetSdkVersion = 33
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         ndkVersion = "25.1.8937393"
     }
     repositories {

example/ios/TelematicsSdkExample.xcodeproj/project.pbxproj

@@ -548,12 +548,12 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = TelematicsSdkExample/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "DemoApp Application";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -580,12 +580,12 @@
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = TelematicsSdkExample/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "DemoApp Application";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",