Skip to content

Commit

Permalink
Update React Native plugin for official 224 release (salesforce-marke…
Browse files Browse the repository at this point in the history
  • Loading branch information
troach-sf authored and billmote committed Mar 3, 2020
1 parent db10e82 commit 93c2f6d
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions RNMarketingCloudSdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Pod::Spec.new do |s|
s.homepage = package['homepage']
s.license = package['license']
s.author = package['author']
s.platform = :ios, "9.0"
s.platform = :ios, "10.0"
s.source = { :git => "https://github.com/author/RNMarketingCloudSdk.git", :tag => "master" }
s.source_files = "ios/**/*.{h,m}"
s.requires_arc = true

s.dependency 'React'
s.dependency 'MarketingCloudSDK', '~> 7.0'
s.static_framework = true
end
end
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {
compileSdkVersion safeExtGet('compileSdkVersion', 28)

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 16)
minSdkVersion safeExtGet('minSdkVersion', 21)
targetSdkVersion safeExtGet('targetSdkVersion', 28)
}
lintOptions {
Expand All @@ -44,4 +44,4 @@ dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:4.3'
testImplementation 'org.mockito:mockito-core:2.28.2'
}
}
8 changes: 4 additions & 4 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ android {
}
signingConfigs {
debug {
storeFile file('debug.keystore')
storePassword 'android'
keyAlias 'androiddebugkey'
keyPassword 'android'
//storeFile file('debug.keystore')
//storePassword 'android'
//keyAlias 'androiddebugkey'
//keyPassword 'android'
}
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 16
minSdkVersion = 21
compileSdkVersion = 28
targetSdkVersion = 28
supportLibVersion = "28.0.0"
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '9.0'
platform :ios, '10.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

target 'example' do
Expand Down
12 changes: 6 additions & 6 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- MarketingCloudSDK (7.0.0)
- MarketingCloudSDK (7.0.1)
- React (0.60.0):
- React-Core (= 0.60.0)
- React-DevSupport (= 0.60.0)
Expand Down Expand Up @@ -113,7 +113,7 @@ DEPENDENCIES:
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- boost-for-react-native
- MarketingCloudSDK

Expand Down Expand Up @@ -170,7 +170,7 @@ SPEC CHECKSUMS:
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
MarketingCloudSDK: 7db3486920319aa9f643b6b4c826f7075e55fcae
MarketingCloudSDK: cbd23ea0fb5576a71b54137652051e23e1892f2c
React: 4b3c068e793e96672dcd186a2b572fac43e4b031
React-Core: 3dc86b22920597f813c62a96db3165950b64826b
React-cxxreact: 0dacb291e59b81e7c3f22a2118bee853ba8a60d2
Expand All @@ -189,9 +189,9 @@ SPEC CHECKSUMS:
React-RCTText: 685fca2e13b024271048e7e247ef24476f28a41e
React-RCTVibration: 4ee1cf208ab17a50fafb1c16ffe28fe594a64e4f
React-RCTWebSocket: fca087d583724aa0e5fef7d911f0f2a28d0f2736
RNMarketingCloudSdk: 38c37a8709d198d71f25ef4623663894cefcd8e0
RNMarketingCloudSdk: bcaa68b1acc90e3ba64baa4981dbe9db5de42156
yoga: 616fde658be980aa60a2158835170f3f9c2d04b4

PODFILE CHECKSUM: 71af8ce61487504ef012db924937962b60a1c82a
PODFILE CHECKSUM: ca8767c442c617f9f5e1f3c0cd4a30b606bb3751

COCOAPODS: 1.7.5
COCOAPODS: 1.8.4
6 changes: 4 additions & 2 deletions example/ios/example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
"$(inherited)",
);
INFOPLIST_FILE = exampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -534,7 +534,7 @@
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = RNQ52E7G3P;
INFOPLIST_FILE = exampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -558,6 +558,7 @@
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = RNQ52E7G3P;
INFOPLIST_FILE = example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -582,6 +583,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RNQ52E7G3P;
INFOPLIST_FILE = example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down
7 changes: 4 additions & 3 deletions ios/RNMarketingCloudSdk.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 58B511D21A9E6C8500147676;
Expand Down Expand Up @@ -156,7 +157,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 = 10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -193,7 +194,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 = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand All @@ -204,7 +205,7 @@
isa = XCBuildConfiguration;
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../../React/**",
"$(SRCROOT)/../../react-native/React/**",
Expand Down

0 comments on commit 93c2f6d

Please sign in to comment.