Skip to content

Commit

Permalink
Update scheduledArrivalAt handling on iOS (#231)
Browse files Browse the repository at this point in the history
* Update scheduledArrivalAt handling on iOS

* Upgrade docker image for android CI

* try different docker path

* Try docker with java 11

* Remove custom scheduledArrivalAt handling in RNRadar.m

* Undo other prev RNradar.m changes

* Bump android to 3.8.4, iOS to 3.8.1
  • Loading branch information
lmeier authored Jun 28, 2023
1 parent d862252 commit 5360d67
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
android:
working_directory: ~/react-native-radar/example
docker:
- image: circleci/android:api-28-node
- image: cimg/android:2023.02.1-browsers
steps:
- checkout:
path: ~/react-native-radar
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
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.7.4'
versionName '3.7.5'
}
lintOptions {
abortOnError false
Expand All @@ -45,5 +45,5 @@ repositories {

dependencies {
api 'com.facebook.react:react-native:+'
api 'io.radar:sdk:3.8.3'
api 'io.radar:sdk:3.8.4'
}
2 changes: 1 addition & 1 deletion ios/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "radarlabs/radar-sdk-ios" "3.7.8"
github "radarlabs/radar-sdk-ios" "3.8.1"
5 changes: 2 additions & 3 deletions ios/RNRadar.m
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,9 @@ - (void)didLogMessage:(NSString *)message {
if (tripOptionsDict == nil) {
tripOptionsDict = optionsDict;
}

RadarTripOptions *options = [RadarTripOptions tripOptionsFromDictionary:tripOptionsDict];
if (options.scheduledArrivalAt) {
options.scheduledArrivalAt = [RCTConvert NSDate:options.scheduledArrivalAt];
}

RadarTrackingOptions *trackingOptions;
NSDictionary *trackingOptionsDict = optionsDict[@"trackingOptions"];
if (trackingOptionsDict != nil) {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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
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.7.4",
"version": "3.7.5",
"main": "js/index.js",
"files": [
"android",
Expand Down
2 changes: 1 addition & 1 deletion react-native-radar.podspec
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.7.8"
s.dependency "RadarSDK", "~> 3.8.1"
end

0 comments on commit 5360d67

Please sign in to comment.