Skip to content

Commit

Permalink
chore: update emarsys sdk
Browse files Browse the repository at this point in the history
chore: update sample dependencies

MV-583
  • Loading branch information
biancalui-emarsys committed Nov 29, 2023
1 parent 016a1c6 commit cc15219
Show file tree
Hide file tree
Showing 11 changed files with 1,836 additions and 2,851 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We created a sample application to help in the integration and give an example.

## Setup

`$ npm install "git+ssh://[email protected]/emartech/react-native-emarsys-sdk.git#1.15.0" --save`
`$ npm install "git+ssh://[email protected]/emartech/react-native-emarsys-sdk.git#1.16.0" --save`

## Requirements

Expand Down
2 changes: 1 addition & 1 deletion RNEmarsysWrapper.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.source_files = "ios/*.{h,m}"
s.requires_arc = true
s.dependency "React", ">= 0.67.3"
s.dependency "EmarsysSDK", "~> 3.3.0"
s.dependency "EmarsysSDK", "~> 3.4.0"

end
10 changes: 5 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ buildscript {
apply plugin: 'com.android.library'

android {
compileSdkVersion 32
buildToolsVersion "28.0.3"
compileSdkVersion 33
buildToolsVersion "33.0.0"
defaultConfig {
minSdkVersion 24
targetSdkVersion 31
versionCode 15
versionName "1.15"
versionCode 16
versionName "1.16"
}
lintOptions {
abortOnError false
Expand All @@ -46,5 +46,5 @@ repositories {

dependencies {
implementation "com.facebook.react:react-native:+"
implementation "com.emarsys:emarsys-sdk:3.5.+"
implementation "com.emarsys:emarsys-sdk:3.6.+"
}
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"name": "react-native-emarsys-wrapper",
"version": "1.15.0",
"version": "1.16.0",
"description": "React Native wrapper for Emarsys SDK",
"main": "index.js",
"type": "module",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [
"react-native",
"Emarsys"
],
"author": "Aliaksandr Andreyeu",
"author": "emarsys",
"license": "MIT",
"peerDependencies": {
"react": ">=17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions sample/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation "androidx.multidex:multidex:2.0.1"

implementation "com.emarsys:emarsys-sdk:3.5.+"
implementation "com.emarsys:emarsys-firebase:3.5.+"
implementation "com.emarsys:emarsys-sdk:3.6.+"
implementation "com.emarsys:emarsys-firebase:3.6.+"

// JSC from node_modules
if (useIntlJsc) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import com.emarsys.rnwrapper.RNEmarsysEventHandler;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.swmansion.reanimated.ReanimatedPackage;
import com.emarsys.rnwrapper.RNEmarsysWrapperPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
Expand Down
4 changes: 4 additions & 0 deletions sample/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ buildscript {
repositories {
google()
mavenCentral()
maven {
url = uri("https://storage.googleapis.com/r8-releases/raw")
}
}
dependencies {
classpath('com.android.tools.build:gradle:7.3.1')
classpath("com.google.gms:google-services:4.3.15")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("com.android.tools:r8:8.2.38")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
15 changes: 15 additions & 0 deletions sample/ios/EmarsysApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -654,6 +655,11 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
};
Expand Down Expand Up @@ -694,6 +700,10 @@
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -702,6 +712,11 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
5 changes: 5 additions & 0 deletions sample/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ target 'EmarsysApp' do
post_install do |installer|
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
end
end
end
end

Expand Down
Loading

0 comments on commit cc15219

Please sign in to comment.