Skip to content

Commit

Permalink
Merge pull request #27 from carnivalmobile/release-3.0.1
Browse files Browse the repository at this point in the history
Release 3.0.1
  • Loading branch information
igstewart3 authored Apr 16, 2019
2 parents cac1abb + ed84718 commit aa289ff
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.android.tools.build:gradle:3.3.2'
}
}

Expand Down Expand Up @@ -48,7 +48,7 @@ repositories {

dependencies {
api 'com.facebook.react:react-native:+'
api 'com.carnival.sdk:carnival:7.0.0'
api 'com.carnival.sdk:carnival:7.0.1'

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:1.10.19'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ protected static void setWrapperInfo() {

setWrapperMethod = Carnival.class.getDeclaredMethod("setWrapper", cArg);
setWrapperMethod.setAccessible(true);
setWrapperMethod.invoke(null, "React Native", "3.0.0");
setWrapperMethod.invoke(null, "React Native", "3.0.1");
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target 'CarnivalSDKReactNative' do
'CxxBridge' # Include this for RN >= 0.47
]

pod 'Carnival', '8.2.0'
pod 'Carnival', '8.2.2'
pod 'Kiwi', '2.4.0'
pod 'OCMock', '3.1.2'

Expand Down
8 changes: 4 additions & 4 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- boost-for-react-native (1.63.0)
- Carnival (8.2.0)
- Carnival (8.2.2)
- DoubleConversion (1.1.5)
- Folly (2016.10.31.00):
- boost-for-react-native
Expand Down Expand Up @@ -28,7 +28,7 @@ PODS:
- yoga (0.56.0.React)

DEPENDENCIES:
- Carnival (= 8.2.0)
- Carnival (= 8.2.2)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- Kiwi (= 2.4.0)
- OCMock (= 3.1.2)
Expand All @@ -55,7 +55,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
Carnival: d54ea7ff27498325bfbafe3be64a6314545ad110
Carnival: efd479c8bd14b7c912fc82c74abd107ce5f7bbff
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
Expand All @@ -64,6 +64,6 @@ SPEC CHECKSUMS:
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85

PODFILE CHECKSUM: 739b2089049ddbf50911da0dda25eaf52b689dc7
PODFILE CHECKSUM: 0d1e9a337529761aaa367b4ee9e3bd986df7fd82

COCOAPODS: 1.5.3
4 changes: 2 additions & 2 deletions ios/RNCarnival.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ -(instancetype)initWithDisplayInAppNotifications:(BOOL)displayNotifications {
if(self) {
self.displayInAppNotifications = displayNotifications;
[CarnivalMessageStream setDelegate:self];
[Carnival setWrapperName:@"React Native" andVersion:@"3.0.0"];
[Carnival setWrapperName:@"React Native" andVersion:@"3.0.1"];
}
return self;
}
Expand Down Expand Up @@ -345,7 +345,7 @@ - (BOOL)shouldPresentInAppNotificationForMessage:(CarnivalMessage *)message {
UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationType)options categories:nil];
[[UIApplication sharedApplication] registerUserNotificationSettings:settings];
}

[[NSOperationQueue mainQueue] addOperationWithBlock:^{
if(![[UIApplication sharedApplication] isRegisteredForRemoteNotifications]) {
[[UIApplication sharedApplication] registerForRemoteNotifications];
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "git",
"url": "git+https://github.com/carnivalmobile/carnival-sdk-react-native.git"
},
"version": "3.0.0",
"version": "3.0.1",
"devDependencies": {
"react-native": "^0.56.0"
}
Expand Down

0 comments on commit aa289ff

Please sign in to comment.