Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vail beta, [DO NOT MERGE] #365

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Vail beta, [DO NOT MERGE] #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69103fe
bump version
lmeier Nov 8, 2024
0ca1516
remove startTracking from type on this branch
lmeier Nov 8, 2024
9ff686c
new beta with android offline rampup
KennyHuRadar Nov 11, 2024
fa06cad
bump android version
KennyHuRadar Nov 26, 2024
395afb7
actaully point it at right version
KennyHuRadar Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
minSdkVersion 16
targetSdkVersion 31
versionCode 1
versionName '3.18.4'
versionName '3.18.5-beta.4'
}
lintOptions {
abortOnError false
Expand All @@ -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.2'
}

2 changes: 1 addition & 1 deletion android/src/main/java/io/radar/react/RNRadarModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4");
editor.apply();
if (fraud) {
Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
Expand Down
2 changes: 1 addition & 1 deletion ios/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "radarlabs/radar-sdk-ios" "3.18.4"
github "radarlabs/radar-sdk-ios" "3.18.6-beta.1"
2 changes: 1 addition & 1 deletion ios/RNRadar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4" forKey:@"radar-xPlatformSDKVersion"];
[Radar initializeWithPublishableKey:publishableKey];
}

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4",
"main": "dist/index.js",
"files": [
"/android",
Expand Down
5 changes: 2 additions & 3 deletions plugin/src/withRadarIOS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ export const withRadarIOS: ConfigPlugin<RadarPluginProps> = (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.6-beta.1'") === -1) {
// Find the target block
const targetRegex = /target '(\w+)' do/g;
const match = targetRegex.exec(contents);
Expand All @@ -63,7 +62,7 @@ export const withRadarIOS: ConfigPlugin<RadarPluginProps> = (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.6-beta.1'`);
const newContents = contents.replace(targetBlock, updatedTargetBlock);

// Write the updated contents back to the Podfile
Expand Down
2 changes: 1 addition & 1 deletion react-native-radar.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-beta.1"
end