From 4e78e3d6f0147f7d3b4c33d21d43a3a92c647d80 Mon Sep 17 00:00:00 2001 From: Eduardo Zatoni <45048607+eduzatoni@users.noreply.github.com> Date: Mon, 24 Jan 2022 12:50:19 +0100 Subject: [PATCH 1/5] MV-228 - update Emarsys SDK to 3.2.0 --- android/build.gradle | 2 +- ios/RNEmarsysWrapper.podspec | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e8ca87f..9219585 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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" } diff --git a/ios/RNEmarsysWrapper.podspec b/ios/RNEmarsysWrapper.podspec index 52e1b43..aa46521 100644 --- a/ios/RNEmarsysWrapper.podspec +++ b/ios/RNEmarsysWrapper.podspec @@ -18,6 +18,6 @@ Pod::Spec.new do |s| 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 diff --git a/package.json b/package.json index aaad594..634a96a 100644 --- a/package.json +++ b/package.json @@ -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": { From 06429faa502e6c1ebb157f5b7526f9bce3015bc7 Mon Sep 17 00:00:00 2001 From: Eduardo Zatoni <45048607+eduzatoni@users.noreply.github.com> Date: Mon, 24 Jan 2022 12:50:53 +0100 Subject: [PATCH 2/5] MV-211 - use package version on iOS podspec --- ios/RNEmarsysWrapper.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNEmarsysWrapper.podspec b/ios/RNEmarsysWrapper.podspec index aa46521..beb1631 100644 --- a/ios/RNEmarsysWrapper.podspec +++ b/ios/RNEmarsysWrapper.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| # s.license = { :type => "MIT", :file => "FILE_LICENSE" } s.author = { "author" => "author@domain.cn" } s.platform = :ios, "11.0" - s.source = { :git => "https://git@github.com/emartech/react-native-emarsys-sdk.git", :tag => "1.4.0" } + s.source = { :git => "https://git@github.com/emartech/react-native-emarsys-sdk.git%22, :tag => "#{s.version}" } s.source_files = "ios/*.{h,m}" s.requires_arc = true s.dependency "React", ">= 0.60.0" From ae96a26bd5c8415ac61c14418136bfe6dbfb0cc4 Mon Sep 17 00:00:00 2001 From: Eduardo Zatoni <45048607+eduzatoni@users.noreply.github.com> Date: Mon, 24 Jan 2022 12:50:53 +0100 Subject: [PATCH 3/5] MV-211 - use package version on iOS podspec --- ios/RNEmarsysWrapper.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNEmarsysWrapper.podspec b/ios/RNEmarsysWrapper.podspec index aa46521..83a58ce 100644 --- a/ios/RNEmarsysWrapper.podspec +++ b/ios/RNEmarsysWrapper.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| # s.license = { :type => "MIT", :file => "FILE_LICENSE" } s.author = { "author" => "author@domain.cn" } s.platform = :ios, "11.0" - s.source = { :git => "https://git@github.com/emartech/react-native-emarsys-sdk.git", :tag => "1.4.0" } + s.source = { :git => "https://git@github.com/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" From 2e6f5317fcf32243925403b63ff42174aea34a44 Mon Sep 17 00:00:00 2001 From: Eduardo Zatoni <45048607+eduzatoni@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:31:44 +0100 Subject: [PATCH 4/5] chore: update version in android build grade --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 9219585..674bfc0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,8 +22,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 29 - versionCode 4 - versionName "1.4" + versionCode 5 + versionName "1.5" } lintOptions { abortOnError false From ef39f3a726aad9e17912b423847dc1c79cf1e946 Mon Sep 17 00:00:00 2001 From: Eduardo Zatoni <45048607+eduzatoni@users.noreply.github.com> Date: Tue, 25 Jan 2022 14:35:13 +0100 Subject: [PATCH 5/5] chore(sample): update dependencies --- .gitignore | 1 + sample/android/app/build.gradle | 8 +- sample/android/build.gradle | 12 +- sample/ios/Podfile.lock | 231 -------------------------------- 4 files changed, 12 insertions(+), 240 deletions(-) delete mode 100644 sample/ios/Podfile.lock diff --git a/.gitignore b/.gitignore index 7f0d223..c53da6d 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ buck-out/ # Bundle artifact *.jsbundle +sample/ios/Podfile.lock diff --git a/sample/android/app/build.gradle b/sample/android/app/build.gradle index 14bfebf..9b4419e 100644 --- a/sample/android/app/build.gradle +++ b/sample/android/app/build.gradle @@ -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 diff --git a/sample/android/build.gradle b/sample/android/build.gradle index 3795e95..ac8fa65 100644 --- a/sample/android/build.gradle +++ b/sample/android/build.gradle @@ -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 @@ -35,5 +36,6 @@ allprojects { google() jcenter() + mavenCentral() } } diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock deleted file mode 100644 index 3c00a41..0000000 --- a/sample/ios/Podfile.lock +++ /dev/null @@ -1,231 +0,0 @@ -PODS: - - boost-for-react-native (1.63.0) - - DoubleConversion (1.1.6) - - EmarsysNotificationService (3.0.0) - - EmarsysSDK (3.0.0) - - Folly (2018.10.22.00): - - boost-for-react-native - - DoubleConversion - - Folly/Default (= 2018.10.22.00) - - glog - - Folly/Default (2018.10.22.00): - - boost-for-react-native - - DoubleConversion - - glog - - glog (0.3.5) - - React (0.60.0): - - React-Core (= 0.60.0) - - React-DevSupport (= 0.60.0) - - React-RCTActionSheet (= 0.60.0) - - React-RCTAnimation (= 0.60.0) - - React-RCTBlob (= 0.60.0) - - React-RCTImage (= 0.60.0) - - React-RCTLinking (= 0.60.0) - - React-RCTNetwork (= 0.60.0) - - React-RCTSettings (= 0.60.0) - - React-RCTText (= 0.60.0) - - React-RCTVibration (= 0.60.0) - - React-RCTWebSocket (= 0.60.0) - - React-Core (0.60.0): - - Folly (= 2018.10.22.00) - - React-cxxreact (= 0.60.0) - - React-jsiexecutor (= 0.60.0) - - yoga (= 0.60.0.React) - - React-cxxreact (0.60.0): - - boost-for-react-native (= 1.63.0) - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-jsinspector (= 0.60.0) - - React-DevSupport (0.60.0): - - React-Core (= 0.60.0) - - React-RCTWebSocket (= 0.60.0) - - React-fishhook (0.60.0) - - React-jsi (0.60.0): - - boost-for-react-native (= 1.63.0) - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-jsi/Default (= 0.60.0) - - React-jsi/Default (0.60.0): - - boost-for-react-native (= 1.63.0) - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-jsiexecutor (0.60.0): - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-cxxreact (= 0.60.0) - - React-jsi (= 0.60.0) - - React-jsinspector (0.60.0) - - React-RCTActionSheet (0.60.0): - - React-Core (= 0.60.0) - - React-RCTAnimation (0.60.0): - - React-Core (= 0.60.0) - - React-RCTBlob (0.60.0): - - React-Core (= 0.60.0) - - React-RCTNetwork (= 0.60.0) - - React-RCTWebSocket (= 0.60.0) - - React-RCTImage (0.60.0): - - React-Core (= 0.60.0) - - React-RCTNetwork (= 0.60.0) - - React-RCTLinking (0.60.0): - - React-Core (= 0.60.0) - - React-RCTNetwork (0.60.0): - - React-Core (= 0.60.0) - - React-RCTSettings (0.60.0): - - React-Core (= 0.60.0) - - React-RCTText (0.60.0): - - React-Core (= 0.60.0) - - React-RCTVibration (0.60.0): - - React-Core (= 0.60.0) - - React-RCTWebSocket (0.60.0): - - React-Core (= 0.60.0) - - React-fishhook (= 0.60.0) - - EmarsysSDK (~> 3.0.0) - - RNEmarsysWrapper (1.3.1): - - React (>= 0.60.0) - - RNGestureHandler (1.10.3): - - React-Core - - RNReanimated (1.13.3): - - React-Core - - RNScreens (2.11.0): - - React - - RNVectorIcons (6.7.0): - - React - - toolbar-android (0.1.0-rc.2): - - React - - yoga (0.60.0.React) - -DEPENDENCIES: - - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - EmarsysNotificationService - - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - React (from `../node_modules/react-native/`) - - React-Core (from `../node_modules/react-native/React`) - - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - - React-DevSupport (from `../node_modules/react-native/React`) - - React-fishhook (from `../node_modules/react-native/Libraries/fishhook`) - - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - React-RCTWebSocket (from `../node_modules/react-native/Libraries/WebSocket`) - - RNEmarsysWrapper (from `../node_modules/react-native-emarsys-wrapper/ios/RNEmarsysWrapper.podspec`) - - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - - RNReanimated (from `../node_modules/react-native-reanimated`) - - RNScreens (from `../node_modules/react-native-screens`) - - RNVectorIcons (from `../node_modules/react-native-vector-icons`) - - "toolbar-android (from `../node_modules/@react-native-community/toolbar-android`)" - - yoga (from `../node_modules/react-native/ReactCommon/yoga`) - -SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - boost-for-react-native - - EmarsysNotificationService - - EmarsysSDK - -EXTERNAL SOURCES: - DoubleConversion: - :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" - Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" - glog: - :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" - React: - :path: "../node_modules/react-native/" - React-Core: - :path: "../node_modules/react-native/React" - React-cxxreact: - :path: "../node_modules/react-native/ReactCommon/cxxreact" - React-DevSupport: - :path: "../node_modules/react-native/React" - React-fishhook: - :path: "../node_modules/react-native/Libraries/fishhook" - React-jsi: - :path: "../node_modules/react-native/ReactCommon/jsi" - React-jsiexecutor: - :path: "../node_modules/react-native/ReactCommon/jsiexecutor" - React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector" - React-RCTActionSheet: - :path: "../node_modules/react-native/Libraries/ActionSheetIOS" - React-RCTAnimation: - :path: "../node_modules/react-native/Libraries/NativeAnimation" - React-RCTBlob: - :path: "../node_modules/react-native/Libraries/Blob" - React-RCTImage: - :path: "../node_modules/react-native/Libraries/Image" - React-RCTLinking: - :path: "../node_modules/react-native/Libraries/LinkingIOS" - React-RCTNetwork: - :path: "../node_modules/react-native/Libraries/Network" - React-RCTSettings: - :path: "../node_modules/react-native/Libraries/Settings" - React-RCTText: - :path: "../node_modules/react-native/Libraries/Text" - React-RCTVibration: - :path: "../node_modules/react-native/Libraries/Vibration" - React-RCTWebSocket: - :path: "../node_modules/react-native/Libraries/WebSocket" - RNEmarsysWrapper: - :podspec: "../node_modules/react-native-emarsys-wrapper/ios/RNEmarsysWrapper.podspec" - RNGestureHandler: - :path: "../node_modules/react-native-gesture-handler" - RNReanimated: - :path: "../node_modules/react-native-reanimated" - RNScreens: - :path: "../node_modules/react-native-screens" - RNVectorIcons: - :path: "../node_modules/react-native-vector-icons" - toolbar-android: - :path: "../node_modules/@react-native-community/toolbar-android" - yoga: - :path: "../node_modules/react-native/ReactCommon/yoga" - -SPEC CHECKSUMS: - boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - EmarsysNotificationService: 7aae567de8b5f634eecce83db31aa94a83276e3f - EmarsysSDK: 4febfe90ef0767d37f8f45c970dd34e8e449dd57 - Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 - glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - React: 4b3c068e793e96672dcd186a2b572fac43e4b031 - React-Core: 3dc86b22920597f813c62a96db3165950b64826b - React-cxxreact: 0dacb291e59b81e7c3f22a2118bee853ba8a60d2 - React-DevSupport: 4eb4135386acd10c2586cc9c759bf96b4dac035e - React-fishhook: 86ca737527bb9d860efbb943c11c729a5b69aa3d - React-jsi: 8e128c4d0d8febc2977ef617d1c09bb54326069c - React-jsiexecutor: 7a3554f703a58963ec80b860144ea0f0e9b910e1 - React-jsinspector: d4ed52225912efe0019bb7f1a225aec20f23049a - React-RCTActionSheet: b27ff3cf3a68f917c46d2b94abf938b625b96570 - React-RCTAnimation: 9e4708e5bd65fca8285ce7c0aa076f3f4fa5c2f8 - React-RCTBlob: 6eafcc3a24f33785692a7be24918ade607bc8719 - React-RCTImage: 46b965d7225b428ea11580ead08a4318aef1d6be - React-RCTLinking: d65b9f56cf0b8e171575a86764df7bb019ac28d6 - React-RCTNetwork: 783ee2f430740e58f724e46adc79fe7feff64202 - React-RCTSettings: aa28315aadfbfaf94206d865673ae509f1e97c07 - React-RCTText: 685fca2e13b024271048e7e247ef24476f28a41e - React-RCTVibration: 4ee1cf208ab17a50fafb1c16ffe28fe594a64e4f - React-RCTWebSocket: fca087d583724aa0e5fef7d911f0f2a28d0f2736 - RNEmarsysWrapper: 41f859c17e2d89cd5aecc48da7886933755512b8 - RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38 - RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43 - RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da - RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d - toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff - yoga: 616fde658be980aa60a2158835170f3f9c2d04b4 - -PODFILE CHECKSUM: e42fd5db0c8bdbdaa19edc3d28ae0b13cc2d8eb8 - -COCOAPODS: 1.10.1