Merge pull request #28 from carnivalmobile/release/3.0.2

Release/3.0.2
sailthru · May 10, 2019 · c7830e0 · c7830e0
2 parents aa289ff + 2adefae
commit c7830e0
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -48,7 +48,7 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'com.carnival.sdk:carnival:7.0.1'
+    api 'com.carnival.sdk:carnival:7.0.2'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:1.10.19'

diff --git a/android/src/main/java/com/reactlibrary/RNCarnivalModule.java b/android/src/main/java/com/reactlibrary/RNCarnivalModule.java
@@ -99,7 +99,7 @@ protected static void setWrapperInfo() {
 
             setWrapperMethod = Carnival.class.getDeclaredMethod("setWrapper", cArg);
             setWrapperMethod.setAccessible(true);
-            setWrapperMethod.invoke(null, "React Native", "3.0.1");
+            setWrapperMethod.invoke(null, "React Native", "3.0.2");
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {

diff --git a/ios/CarnivalSDKReactNative.xcodeproj/project.pbxproj b/ios/CarnivalSDKReactNative.xcodeproj/project.pbxproj
@@ -239,7 +239,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-frameworks.sh",
 				"${PODS_ROOT}/Carnival/Carnival.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -248,7 +248,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3BC764DC5DE02361F52F7E56 /* [CP] Check Pods Manifest.lock */ = {
@@ -275,7 +275,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-resources.sh",
 				"${PODS_ROOT}/Carnival/Carnival.framework/[email protected]",
 				"${PODS_ROOT}/Carnival/Carnival.framework/[email protected]",
 				"${PODS_ROOT}/Carnival/Carnival.framework/[email protected]",
@@ -316,7 +316,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CarnivalSDKReactNativeTests/Pods-CarnivalSDKReactNativeTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/ios/Podfile b/ios/Podfile
@@ -1,31 +1,29 @@
 # Uncomment the next line to define a global platform for your project
 # platform :ios, '9.0'
 
-target 'CarnivalSDKReactNative' do
+target "CarnivalSDKReactNative" do
   # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
   # use_frameworks!
 
   # Pods for CarnivalSDKReactNative
 
-  target 'CarnivalSDKReactNativeTests' do
+  target "CarnivalSDKReactNativeTests" do
     inherit! :search_paths
     # Pods for testing
 
-    pod 'React', :path => '../node_modules/react-native', :subspecs => [
-      'Core',
-      'CxxBridge' # Include this for RN >= 0.47
+    pod "React", path: "../node_modules/react-native", subspecs: [
+      "Core",
+      "CxxBridge" # Include this for RN >= 0.47
     ]
 
-    pod 'Carnival', '8.2.2'
-    pod 'Kiwi', '2.4.0'
-    pod 'OCMock', '3.1.2'
+    pod "Carnival", "8.2.3"
+    pod "Kiwi", "2.4.0"
+    pod "OCMock", "3.1.2"
 
     # Explicitly include Yoga if you are using RN >= 0.42.0
-    pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+    pod "yoga", path: "../node_modules/react-native/ReactCommon/yoga"
 
     # Third party deps podspec link
-    pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-
+    pod "Folly", podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   end
-
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - boost-for-react-native (1.63.0)
-  - Carnival (8.2.2)
+  - Carnival (8.2.3)
   - DoubleConversion (1.1.5)
   - Folly (2016.10.31.00):
     - boost-for-react-native
@@ -28,7 +28,7 @@ PODS:
   - yoga (0.56.0.React)
 
 DEPENDENCIES:
-  - Carnival (= 8.2.2)
+  - Carnival (= 8.2.3)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - Kiwi (= 2.4.0)
   - OCMock (= 3.1.2)
@@ -55,15 +55,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  Carnival: efd479c8bd14b7c912fc82c74abd107ce5f7bbff
+  Carnival: bac578dbc960d3fb13aeaf54d34050009b66e0ac
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
   OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
-  React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
-  yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
+  React: bdb39c05e2eed10a43056cff89a68bc9ebe7f232
+  yoga: 2418c171de153cbe3c94dc28c3bf691b1695ae17
 
-PODFILE CHECKSUM: 0d1e9a337529761aaa367b4ee9e3bd986df7fd82
+PODFILE CHECKSUM: 976f4fb03ba439b89409fa649e52e062b26edad3
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1
diff --git a/ios/RNCarnival.m b/ios/RNCarnival.m
@@ -35,7 +35,7 @@ -(instancetype)initWithDisplayInAppNotifications:(BOOL)displayNotifications {
     if(self) {
         self.displayInAppNotifications = displayNotifications;
         [CarnivalMessageStream setDelegate:self];
-        [Carnival setWrapperName:@"React Native" andVersion:@"3.0.1"];
+        [Carnival setWrapperName:@"React Native" andVersion:@"3.0.2"];
     }
     return self;
 }

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "type": "git",
     "url": "git+https://github.com/carnivalmobile/carnival-sdk-react-native.git"
   },
-  "version": "3.0.1",
+  "version": "3.0.2",
   "devDependencies": {
     "react-native": "^0.56.0"
   }