Skip to content

Commit

Permalink
Merge pull request #50 from emartech/MV-228-update-Emarsys-SDK-to-3.2.0
Browse files Browse the repository at this point in the history
Mv 228 update emarsys sdk to 3.2.0
  • Loading branch information
biancalui-emarsys authored Jan 26, 2022
2 parents c71157c + ef39f3a commit 46705ef
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 246 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ buck-out/

# Bundle artifact
*.jsbundle
sample/ios/Podfile.lock
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 29
versionCode 4
versionName "1.4"
versionCode 5
versionName "1.5"
}
lintOptions {
abortOnError false
Expand All @@ -47,5 +47,5 @@ repositories {

dependencies {
implementation "com.facebook.react:react-native:+"
implementation "com.emarsys:emarsys-sdk:3.0.0"
implementation "com.emarsys:emarsys-sdk:3.2.0"
}
4 changes: 2 additions & 2 deletions ios/RNEmarsysWrapper.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Pod::Spec.new do |s|
# s.license = { :type => "MIT", :file => "FILE_LICENSE" }
s.author = { "author" => "[email protected]" }
s.platform = :ios, "11.0"
s.source = { :git => "https://[email protected]/emartech/react-native-emarsys-sdk.git", :tag => "1.4.0" }
s.source = { :git => "https://[email protected]/emartech/react-native-emarsys-sdk.git", :tag => "#{s.version}" }
s.source_files = "ios/*.{h,m}"
s.requires_arc = true
s.dependency "React", ">= 0.60.0"
s.dependency "EmarsysSDK", "~> 3.0.0"
s.dependency "EmarsysSDK", "~> 3.2.0"

end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-emarsys-wrapper",
"version": "1.4.0",
"version": "1.5.0",
"description": "React Native wrapper for Emarsys SDK",
"main": "index.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions sample/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.facebook.react:react-native:+" // From node_modules

implementation "com.google.android.gms:play-services-base:16.1.0"
implementation "com.google.android.gms:play-services-base:18.0.1"

implementation "me.leolin:ShortcutBadger:1.1.21@aar"

implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
implementation "androidx.appcompat:appcompat:1.4.1"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation "androidx.multidex:multidex:2.0.1"

implementation "com.emarsys:emarsys-sdk:3.0.0"
implementation "com.emarsys:emarsys-sdk:3.2.0"
implementation 'com.emarsys:emarsys-firebase:+'

// JSC from node_modules
Expand Down
12 changes: 7 additions & 5 deletions sample/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
buildscript {
ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 21
compileSdkVersion = 28
targetSdkVersion = 28
minSdkVersion = 24
compileSdkVersion = 31
targetSdkVersion = 31
supportLibVersion = "28.0.0"
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:3.5.3")
classpath("com.google.gms:google-services:4.3.2")
classpath("com.android.tools.build:gradle:3.5.4")
classpath("com.google.gms:google-services:4.3.10")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -35,5 +36,6 @@ allprojects {

google()
jcenter()
mavenCentral()
}
}
231 changes: 0 additions & 231 deletions sample/ios/Podfile.lock

This file was deleted.

0 comments on commit 46705ef

Please sign in to comment.