Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ repositories {
}

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'com.batch.android:batch-sdk:1.10+'
compile 'com.google.android.gms:play-services-base:+'
compile 'com.google.android.gms:play-services-gcm:+'
compile 'com.android.support:support-v4:27.0.1'
compile 'com.android.support:appcompat-v7:27.0.1'
implementation 'com.facebook.react:react-native:+'
implementation 'com.batch.android:batch-sdk:1.14+'
implementation 'com.google.android.gms:play-services-base:+'
implementation 'com.google.android.gms:play-services-gcm:+'
implementation 'com.android.support:support-v4:27.0.1'
implementation 'com.android.support:appcompat-v7:27.0.1'
}

15 changes: 5 additions & 10 deletions ios/RNBatch.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@

#if __has_include("RCTBridgeModule.h")
#import "RCTBridgeModule.h"
#else
#if __has_include(<React/RCTAssert.h>)
#import <React/RCTBridgeModule.h>
#endif

#if __has_include("../../../ios/Pods/Batch/Batch.embeddedframework/Batch.framework/Headers/Batch.h")
#import "../../../ios/Pods/Batch/Batch.embeddedframework/Batch.framework/Headers/Batch.h"
#else
#import "../../../ios/Frameworks/Batch.embeddedframework/Batch.framework/Headers/Batch.h"
#import <React/RCTUtils.h>
#else // back compatibility for RN version < 0.40
#import "RCTBridgeModule.h"
#import "RCTUtils.h"
#endif

@interface RNBatch : NSObject <RCTBridgeModule>

@end
5 changes: 3 additions & 2 deletions ios/RNBatch.m
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@

#import "RNBatch.h"
#import <Batch/Batch.h>

@implementation RNBatch

RCT_EXPORT_MODULE()

- (dispatch_queue_t)methodQueue
{
return dispatch_get_main_queue();
}
RCT_EXPORT_MODULE()

- (id)init {
self = [super init];
Expand Down
24 changes: 0 additions & 24 deletions ios/RNBatch.podspec

This file was deleted.

35 changes: 26 additions & 9 deletions ios/RNBatch.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
dependencies = (
);
name = RNBatch;
productName = RCTDataManager;
productName = RNBatch;
productReference = 134814201AA4EA6300B7C361 /* libRNBatch.a */;
productType = "com.apple.product-type.library.static";
};
Expand Down Expand Up @@ -123,6 +123,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -138,7 +139,9 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -149,14 +152,13 @@
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -167,6 +169,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -182,7 +185,9 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -193,7 +198,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand All @@ -203,11 +208,17 @@
58B511F01A9E6C8500147676 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../ios/*/**";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"~/Documents/Intercom",
"$(SRCROOT)/../../../ios/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Carthage/Build/**",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../../React/**",
"$(SRCROOT)/../../react-native/React/**/**",
"$(SRCROOT)/../../react-native/React/**",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand All @@ -220,11 +231,17 @@
58B511F11A9E6C8500147676 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../ios/*/**";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"~/Documents/Intercom",
"$(SRCROOT)/../../../ios/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Carthage/Build/**",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../../React/**",
"$(SRCROOT)/../../react-native/React/**/**",
"$(SRCROOT)/../../react-native/React/**",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down
9 changes: 0 additions & 9 deletions ios/RNBatch.xcworkspace/contents.xcworkspacedata

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "1.4.0",
"description": "React Native integration of the Batch SDK",
"bugs": {
"url": "https://github.com/dangerfarms/react-native-batch/issues",
"url": "https://github.com/heappi/react-native-batch/issues",
"email": "[email protected]"
},
"repository": {
"type": "git",
"url": "https://github.com/dangerfarms/react-native-batch.git"
"url": "https://github.com/heappi/react-native-batch.git"
},
"homepage": "https://github.com/dangerfarms/react-native-batch#readme",
"homepage": "https://github.com/heappi/react-native-batch",
"keywords": [
"react-native",
"batch"
Expand Down
19 changes: 19 additions & 0 deletions react-native-batch.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
require 'json'

package = JSON.parse(File.read(File.join(__dir__, 'package.json')))

Pod::Spec.new do |s|
s.name = package['name']
s.version = package['version']
s.license = { :type => 'MIT' }
s.homepage = package['homepage']
s.author = { 'Benoit VALLON' => '[email protected]' }
s.summary = package['description']
s.source = { :git => package['repository']['url'] }
s.source_files = "ios/*.{h,m}"
s.platform = :ios, "10.0"
s.frameworks = [ "Batch" ]
s.static_framework = true
s.dependency 'React'
s.dependency 'Batch'
end