React Native 0.40 fix

kegaretail · Jan 26, 2017 · 33571f2 · 33571f2
1 parent fc8a6a8
commit 33571f2
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 10 deletions.
diff --git a/android/src/main/java/nl/kega/reactnativerabbitmq/RabbitMqExchange.java b/android/src/main/java/nl/kega/reactnativerabbitmq/RabbitMqExchange.java
@@ -53,8 +53,9 @@ public void publish(String message, String routing_key){
             byte[] message_body_bytes = message.getBytes();
 
             AMQP.BasicProperties properties = new AMQP.BasicProperties();
-            //properties.setExpiration("60000");
-
+
+            // AMQP.BasicProperties properties = new BasicProperties.Builder().expiration("60000").build();
+
             this.channel.basicPublish(this.name, routing_key, properties, message_body_bytes);
         } catch (Exception e){
             Log.e("RabbitMqExchange", "Exchange publish error " + e);

diff --git a/ios/RCTReactNativeRabbitMq/RCTReactNativeRabbitMq.h b/ios/RCTReactNativeRabbitMq/RCTReactNativeRabbitMq.h
@@ -1,4 +1,11 @@
-#import "RCTBridge.h"
+//DO NO REMOVE THIS LINE IF YOU'RE USING IT ON RN > 0.40 PROJECT
+//#define OLDER_IMPORT
+
+#ifdef OLDER_IMPORT
+    #import "RCTBridge.h"
+#else
+    #import <React/RCTBridge.h>
+#endif
 
 @interface ReactNativeRabbitMq : NSObject <RCTBridgeModule>
 

diff --git a/ios/RCTReactNativeRabbitMq/RabbitMqConnection.h b/ios/RCTReactNativeRabbitMq/RabbitMqConnection.h
@@ -1,5 +1,12 @@
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
+
+#ifdef OLDER_IMPORT
+    #import "RCTBridge.h"
+    #import "RCTEventDispatcher.h"
+#else
+    #import <React/RCTBridge.h>
+    #import <React/RCTEventDispatcher.h>
+#endif
+
 #import <RMQClient/RMQClient.h>
 #import <RMQClient/RMQChannel.h>
 #import "RabbitMqQueue.h"

diff --git a/ios/RCTReactNativeRabbitMq/RabbitMqDelegateLogger.h b/ios/RCTReactNativeRabbitMq/RabbitMqDelegateLogger.h
@@ -1,5 +1,12 @@
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
+
+#ifdef OLDER_IMPORT
+    #import "RCTBridge.h"
+    #import "RCTEventDispatcher.h"
+#else
+    #import <React/RCTBridge.h>
+    #import <React/RCTEventDispatcher.h>
+#endif
+
 #import "RMQConnectionDelegate.h"
 
 @interface RabbitMqDelegateLogger : NSObject <RMQConnectionDelegate>

diff --git a/ios/RCTReactNativeRabbitMq/RabbitMqQueue.h b/ios/RCTReactNativeRabbitMq/RabbitMqQueue.h
@@ -1,5 +1,12 @@
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
+
+#ifdef OLDER_IMPORT
+    #import "RCTBridge.h"
+    #import "RCTEventDispatcher.h"
+#else
+    #import <React/RCTBridge.h>
+    #import <React/RCTEventDispatcher.h>
+#endif
+
 #import <RMQClient/RMQClient.h>
 
 @interface RabbitMqQueue : NSObject <RCTBridgeModule>

diff --git a/package.json b/package.json
@@ -82,6 +82,11 @@
     "type": "git",
     "url": "git+https://github.com/kegaretail/react-native-rabbitmq.git"
   },
+  "rnpm": {
+    "commands": {
+      "prelink": "node ./node_modules/react-native-rabbitmq/scripts/prelink.js"
+    }
+  },
   "scripts": {},
-  "version": "0.4.3"
+  "version": "0.5.0"
 }
diff --git a/scripts/prelink.js b/scripts/prelink.js
@@ -0,0 +1,31 @@
+try {
+    var fs = require('fs');
+    var glob = require('glob');
+    var PACKAGE_JSON = process.cwd() + '/package.json';
+    var package = JSON.parse(fs.readFileSync(PACKAGE_JSON));
+    var APP_NAME = package.name;
+    var PACKAGE_GRADLE = process.cwd() + '/node_modules/react-native-rabbitmq/android/build.gradle'
+    var VERSION = checkVersion();
+
+    if (VERSION < 0.40) {
+        glob('**/RCTReactNativeRabbitMq.h',{}, function(err, files) {
+            if(Array.isArray(files)) {
+                var target = process.cwd() + '/' + files[0];
+                console.log('\033[92mPatching .. \033[97m' + target);
+                var data = fs.readFileSync(target);
+                fs.writeFileSync(target, String(data).replace(/\/\/#define OLDER_IMPORT/, '#define OLDER_IMPORT'));
+                console.log('done.')
+            }
+        })
+    }
+
+    function checkVersion() {
+        console.log('react-native-rabbitmq checking app version ..');
+        return parseFloat(/\d\.\d+(?=\.)/.exec(package.dependencies['react-native']));
+    }
+
+} catch(err) {
+  console.log(
+    '\033[95mreact-native-rabbitmq\033[97m link \033[91mFAILED \033[97m\nCould not automatically link package :'+
+    err.stack)
+}