From 69103feec68b182fd29f8061499d3b1561edf3ee Mon Sep 17 00:00:00 2001 From: Liam Meier Date: Fri, 8 Nov 2024 17:28:54 -0500 Subject: [PATCH 1/5] bump version --- android/build.gradle | 2 +- android/src/main/java/io/radar/react/RNRadarModule.java | 2 +- ios/Cartfile.resolved | 2 +- ios/RNRadar.m | 2 +- package-lock.json | 4 ++-- package.json | 2 +- plugin/src/withRadarIOS.ts | 5 ++--- react-native-radar.podspec | 2 +- src/@types/types.ts | 1 + 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b31cdea6..184b1a54 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 16 targetSdkVersion 31 versionCode 1 - versionName '3.18.4' + versionName '3.18.5-beta.1' } lintOptions { abortOnError false diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java index 3ed444f0..b6d9af57 100644 --- a/android/src/main/java/io/radar/react/RNRadarModule.java +++ b/android/src/main/java/io/radar/react/RNRadarModule.java @@ -96,7 +96,7 @@ public void initialize(String publishableKey, boolean fraud) { this.fraud = fraud; SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit(); editor.putString("x_platform_sdk_type", "ReactNative"); - editor.putString("x_platform_sdk_version", "3.18.4"); + editor.putString("x_platform_sdk_version", "3.18.5-beta.1"); editor.apply(); if (fraud) { Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud); diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved index 7f6c6b19..cd7c0eaa 100644 --- a/ios/Cartfile.resolved +++ b/ios/Cartfile.resolved @@ -1 +1 @@ -github "radarlabs/radar-sdk-ios" "3.18.4" +github "radarlabs/radar-sdk-ios" "3.18.5-beta.1" diff --git a/ios/RNRadar.m b/ios/RNRadar.m index d362688e..a9862870 100644 --- a/ios/RNRadar.m +++ b/ios/RNRadar.m @@ -102,7 +102,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token { RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) { [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"]; - [[NSUserDefaults standardUserDefaults] setObject:@"3.18.4" forKey:@"radar-xPlatformSDKVersion"]; + [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.1" forKey:@"radar-xPlatformSDKVersion"]; [Radar initializeWithPublishableKey:publishableKey]; } diff --git a/package-lock.json b/package-lock.json index 5d2d2a73..40ad2421 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "react-native-radar", - "version": "3.18.4", + "version": "3.18.5-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "react-native-radar", - "version": "3.18.4", + "version": "3.18.5-beta.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index 80e370a0..720375e2 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "React Native module for Radar, the leading geofencing and location tracking platform", "homepage": "https://radar.com", "license": "Apache-2.0", - "version": "3.18.4", + "version": "3.18.5-beta.1", "main": "dist/index.js", "files": [ "/android", diff --git a/plugin/src/withRadarIOS.ts b/plugin/src/withRadarIOS.ts index 2405e314..299c0c8d 100644 --- a/plugin/src/withRadarIOS.ts +++ b/plugin/src/withRadarIOS.ts @@ -52,8 +52,7 @@ export const withRadarIOS: ConfigPlugin = (config, args) => { const contents = await fs.readFile(filePath, 'utf-8'); // Check if the pod declaration already exists - const RadarSDKMotionVersion = '3.18.3' - if (contents.indexOf(`pod 'RadarSDKMotion', ${RadarSDKMotionVersion}`) === -1) { + if (contents.indexOf("pod 'RadarSDKMotion', '3.18.5-beta.1'") === -1) { // Find the target block const targetRegex = /target '(\w+)' do/g; const match = targetRegex.exec(contents); @@ -63,7 +62,7 @@ export const withRadarIOS: ConfigPlugin = (config, args) => { // Insert the pod declaration within the target block const targetBlock = contents.substring(targetStartIndex, targetEndIndex); - const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n pod 'RadarSDKMotion', '3.18.3'`); + const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n pod 'RadarSDKMotion', '3.18.5-beta.1'`); const newContents = contents.replace(targetBlock, updatedTargetBlock); // Write the updated contents back to the Podfile diff --git a/react-native-radar.podspec b/react-native-radar.podspec index 4b169ce3..9bd028ad 100644 --- a/react-native-radar.podspec +++ b/react-native-radar.podspec @@ -15,5 +15,5 @@ Pod::Spec.new do |s| s.platform = :ios, "10.0" s.dependency "React" - s.dependency "RadarSDK", "~> 3.18.4" + s.dependency "RadarSDK", "~> 3.18.5-beta.1" end diff --git a/src/@types/types.ts b/src/@types/types.ts index bff337ee..e7a476b9 100644 --- a/src/@types/types.ts +++ b/src/@types/types.ts @@ -309,6 +309,7 @@ export interface RadarTripOptions { mode?: RadarRouteMode; scheduledArrivalAt?: number; approachingThreshold?: number; + startTracking?: boolean; // defaults to true } export interface RadarTrackCallback { From 0ca15164346ffbdcdedea3803caf4d6ca1136fa2 Mon Sep 17 00:00:00 2001 From: Liam Meier Date: Fri, 8 Nov 2024 17:33:27 -0500 Subject: [PATCH 2/5] remove startTracking from type on this branch --- src/@types/types.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/@types/types.ts b/src/@types/types.ts index e7a476b9..bff337ee 100644 --- a/src/@types/types.ts +++ b/src/@types/types.ts @@ -309,7 +309,6 @@ export interface RadarTripOptions { mode?: RadarRouteMode; scheduledArrivalAt?: number; approachingThreshold?: number; - startTracking?: boolean; // defaults to true } export interface RadarTrackCallback { From 9ff686c7a92a5b6b2313328ae91e835496943ce6 Mon Sep 17 00:00:00 2001 From: Kenny Hu Date: Mon, 11 Nov 2024 11:05:39 -0500 Subject: [PATCH 3/5] new beta with android offline rampup --- android/build.gradle | 4 ++-- android/src/main/java/io/radar/react/RNRadarModule.java | 2 +- ios/Cartfile.resolved | 2 +- ios/RNRadar.m | 2 +- package-lock.json | 4 ++-- package.json | 2 +- plugin/src/withRadarIOS.ts | 4 ++-- react-native-radar.podspec | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 184b1a54..fcbddb95 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 16 targetSdkVersion 31 versionCode 1 - versionName '3.18.5-beta.1' + versionName '3.18.5-beta.2' } lintOptions { abortOnError false @@ -45,6 +45,6 @@ repositories { dependencies { api 'com.facebook.react:react-native:+' - api 'io.radar:sdk:3.18.5' + api 'io.radar:sdk:3.18.7-beta.1' } diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java index b6d9af57..56b8988d 100644 --- a/android/src/main/java/io/radar/react/RNRadarModule.java +++ b/android/src/main/java/io/radar/react/RNRadarModule.java @@ -96,7 +96,7 @@ public void initialize(String publishableKey, boolean fraud) { this.fraud = fraud; SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit(); editor.putString("x_platform_sdk_type", "ReactNative"); - editor.putString("x_platform_sdk_version", "3.18.5-beta.1"); + editor.putString("x_platform_sdk_version", "3.18.5-beta.2"); editor.apply(); if (fraud) { Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud); diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved index cd7c0eaa..24b6a038 100644 --- a/ios/Cartfile.resolved +++ b/ios/Cartfile.resolved @@ -1 +1 @@ -github "radarlabs/radar-sdk-ios" "3.18.5-beta.1" +github "radarlabs/radar-sdk-ios" "3.18.6-beta.1" diff --git a/ios/RNRadar.m b/ios/RNRadar.m index a9862870..5bbaf96b 100644 --- a/ios/RNRadar.m +++ b/ios/RNRadar.m @@ -102,7 +102,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token { RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) { [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"]; - [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.1" forKey:@"radar-xPlatformSDKVersion"]; + [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.2" forKey:@"radar-xPlatformSDKVersion"]; [Radar initializeWithPublishableKey:publishableKey]; } diff --git a/package-lock.json b/package-lock.json index 40ad2421..267a656c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "react-native-radar", - "version": "3.18.5-beta.1", + "version": "3.18.5-beta.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "react-native-radar", - "version": "3.18.5-beta.1", + "version": "3.18.5-beta.2", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index 720375e2..a899981b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "React Native module for Radar, the leading geofencing and location tracking platform", "homepage": "https://radar.com", "license": "Apache-2.0", - "version": "3.18.5-beta.1", + "version": "3.18.5-beta.2", "main": "dist/index.js", "files": [ "/android", diff --git a/plugin/src/withRadarIOS.ts b/plugin/src/withRadarIOS.ts index 299c0c8d..bd3b1370 100644 --- a/plugin/src/withRadarIOS.ts +++ b/plugin/src/withRadarIOS.ts @@ -52,7 +52,7 @@ export const withRadarIOS: ConfigPlugin = (config, args) => { const contents = await fs.readFile(filePath, 'utf-8'); // Check if the pod declaration already exists - if (contents.indexOf("pod 'RadarSDKMotion', '3.18.5-beta.1'") === -1) { + if (contents.indexOf("pod 'RadarSDKMotion', '3.18.6-beta.1'") === -1) { // Find the target block const targetRegex = /target '(\w+)' do/g; const match = targetRegex.exec(contents); @@ -62,7 +62,7 @@ export const withRadarIOS: ConfigPlugin = (config, args) => { // Insert the pod declaration within the target block const targetBlock = contents.substring(targetStartIndex, targetEndIndex); - const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n pod 'RadarSDKMotion', '3.18.5-beta.1'`); + const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n pod 'RadarSDKMotion', '3.18.6-beta.1'`); const newContents = contents.replace(targetBlock, updatedTargetBlock); // Write the updated contents back to the Podfile diff --git a/react-native-radar.podspec b/react-native-radar.podspec index 9bd028ad..8cbd9e88 100644 --- a/react-native-radar.podspec +++ b/react-native-radar.podspec @@ -15,5 +15,5 @@ Pod::Spec.new do |s| s.platform = :ios, "10.0" s.dependency "React" - s.dependency "RadarSDK", "~> 3.18.5-beta.1" + s.dependency "RadarSDK", "~> 3.18.6-beta.1" end From fa06cadbb1da37ad01f1a24360e034b85f4bd2bc Mon Sep 17 00:00:00 2001 From: Kenny Hu Date: Tue, 26 Nov 2024 18:55:33 -0500 Subject: [PATCH 4/5] bump android version --- android/build.gradle | 4 ++-- android/src/main/java/io/radar/react/RNRadarModule.java | 2 +- ios/RNRadar.m | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index fcbddb95..3a821ca7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 16 targetSdkVersion 31 versionCode 1 - versionName '3.18.5-beta.2' + versionName '3.18.5-beta.3' } lintOptions { abortOnError false @@ -45,6 +45,6 @@ repositories { dependencies { api 'com.facebook.react:react-native:+' - api 'io.radar:sdk:3.18.7-beta.1' + api 'io.radar:sdk:3.18.5-beta.2' } diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java index 56b8988d..d76991fa 100644 --- a/android/src/main/java/io/radar/react/RNRadarModule.java +++ b/android/src/main/java/io/radar/react/RNRadarModule.java @@ -96,7 +96,7 @@ public void initialize(String publishableKey, boolean fraud) { this.fraud = fraud; SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit(); editor.putString("x_platform_sdk_type", "ReactNative"); - editor.putString("x_platform_sdk_version", "3.18.5-beta.2"); + editor.putString("x_platform_sdk_version", "3.18.5-beta.3"); editor.apply(); if (fraud) { Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud); diff --git a/ios/RNRadar.m b/ios/RNRadar.m index 5bbaf96b..5373ed93 100644 --- a/ios/RNRadar.m +++ b/ios/RNRadar.m @@ -102,7 +102,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token { RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) { [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"]; - [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.2" forKey:@"radar-xPlatformSDKVersion"]; + [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.3" forKey:@"radar-xPlatformSDKVersion"]; [Radar initializeWithPublishableKey:publishableKey]; } diff --git a/package-lock.json b/package-lock.json index 267a656c..512f8850 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "react-native-radar", - "version": "3.18.5-beta.2", + "version": "3.18.5-beta.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "react-native-radar", - "version": "3.18.5-beta.2", + "version": "3.18.5-beta.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index a899981b..ced456d5 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "React Native module for Radar, the leading geofencing and location tracking platform", "homepage": "https://radar.com", "license": "Apache-2.0", - "version": "3.18.5-beta.2", + "version": "3.18.5-beta.3", "main": "dist/index.js", "files": [ "/android", From 395afb7fc5bf6b2f40f4477db34a2ef8cb32086f Mon Sep 17 00:00:00 2001 From: Kenny Hu Date: Tue, 26 Nov 2024 19:35:22 -0500 Subject: [PATCH 5/5] actaully point it at right version --- android/build.gradle | 4 ++-- android/src/main/java/io/radar/react/RNRadarModule.java | 2 +- ios/RNRadar.m | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3a821ca7..f4b277b4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 16 targetSdkVersion 31 versionCode 1 - versionName '3.18.5-beta.3' + versionName '3.18.5-beta.4' } lintOptions { abortOnError false @@ -45,6 +45,6 @@ repositories { dependencies { api 'com.facebook.react:react-native:+' - api 'io.radar:sdk:3.18.5-beta.2' + api 'io.radar:sdk:3.18.7-beta.2' } diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java index d76991fa..c6cbad2e 100644 --- a/android/src/main/java/io/radar/react/RNRadarModule.java +++ b/android/src/main/java/io/radar/react/RNRadarModule.java @@ -96,7 +96,7 @@ public void initialize(String publishableKey, boolean fraud) { this.fraud = fraud; SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit(); editor.putString("x_platform_sdk_type", "ReactNative"); - editor.putString("x_platform_sdk_version", "3.18.5-beta.3"); + editor.putString("x_platform_sdk_version", "3.18.5-beta.4"); editor.apply(); if (fraud) { Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud); diff --git a/ios/RNRadar.m b/ios/RNRadar.m index 5373ed93..5e6684d4 100644 --- a/ios/RNRadar.m +++ b/ios/RNRadar.m @@ -102,7 +102,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token { RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) { [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"]; - [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.3" forKey:@"radar-xPlatformSDKVersion"]; + [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.4" forKey:@"radar-xPlatformSDKVersion"]; [Radar initializeWithPublishableKey:publishableKey]; } diff --git a/package-lock.json b/package-lock.json index 512f8850..a9ea9395 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "react-native-radar", - "version": "3.18.5-beta.3", + "version": "3.18.5-beta.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "react-native-radar", - "version": "3.18.5-beta.3", + "version": "3.18.5-beta.4", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index ced456d5..96d62e58 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "React Native module for Radar, the leading geofencing and location tracking platform", "homepage": "https://radar.com", "license": "Apache-2.0", - "version": "3.18.5-beta.3", + "version": "3.18.5-beta.4", "main": "dist/index.js", "files": [ "/android",