Skip to content

Commit

Permalink
Update native sdks (#122)
Browse files Browse the repository at this point in the history
* [UPDATE-NATIVE] Update native SDKs and build settings

* [UPDATE-NATIVE] Update version for release 13.0.0

* [UPDATE-NATIVE] Update Bitrise stack
  • Loading branch information
igstewart3 authored Sep 18, 2024
1 parent 8cbe57a commit c4e55d0
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
dependencies {
//noinspection GradleDynamicVersion
api "com.facebook.react:react-android:+"
api "com.marigold.sdk:marigold:21.0.0"
api "com.marigold.sdk:marigold:23.0.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
Expand Down
6 changes: 3 additions & 3 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Enabled for Android X
android.useAndroidX=true

MarigoldRNSDK_kotlinVersion=1.9.23
MarigoldRNSDK_kotlinVersion=1.9.24
MarigoldRNSDK_minSdkVersion=23
MarigoldRNSDK_targetSdkVersion=34
MarigoldRNSDK_compileSdkVersion=34
MarigoldRNSDK_targetSdkVersion=35
MarigoldRNSDK_compileSdkVersion=35
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RNMarigoldModule(reactContext: ReactApplicationContext) : ReactContextBase
val setWrapperMethod = companionClass.getDeclaredMethod("setWrapper", *cArg)

setWrapperMethod.isAccessible = true
setWrapperMethod.invoke(Marigold.Companion, "React Native", "12.0.1")
setWrapperMethod.invoke(Marigold.Companion, "React Native", "13.0.0")
} catch (e: NoSuchMethodException) {
e.printStackTrace()
} catch (e: IllegalAccessException) {
Expand Down
3 changes: 2 additions & 1 deletion bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ trigger_map:
workflow: primary
meta:
bitrise.io:
stack: osx-xcode-15.3.x
stack: osx-xcode-16.0.x
machine_type_id: g2-m1.4core
6 changes: 3 additions & 3 deletions ios/MarigoldSDKReactNative.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -389,7 +389,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD = "";
LDPLUSPLUS = "";
MTL_ENABLE_DEBUG_INFO = YES;
Expand Down Expand Up @@ -452,7 +452,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD = "";
LDPLUSPLUS = "";
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

# Uncomment the next line to define a global platform for your project
platform :ios, '13.4'
platform :ios, '15.6'

target "MarigoldSDKReactNative" do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
Expand Down
18 changes: 9 additions & 9 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ PODS:
- fmt (9.1.0)
- glog (0.3.5)
- Kiwi (2.4.0)
- Marigold (16.0.1)
- Marigold-Extension (16.0.1)
- Marigold (18.0.0)
- Marigold-Extension (18.0.0)
- OCMock (3.1.2)
- RCT-Folly (2024.01.01.00):
- boost
Expand Down Expand Up @@ -911,9 +911,9 @@ PODS:
- React-Mapbuffer (0.74.1):
- glog
- React-debug
- react-native-marigold (12.0.0):
- Marigold (= 16.0.1)
- Marigold-Extension (= 16.0.1)
- react-native-marigold (12.0.1):
- Marigold (= 18.0.0)
- Marigold-Extension (= 18.0.0)
- React-Core
- React-nativeconfig (0.74.1)
- React-NativeModulesApple (0.74.1):
Expand Down Expand Up @@ -1312,8 +1312,8 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
Marigold: bb706e287e4a783756d742e170b49004bcca6469
Marigold-Extension: 425b46dc1572395aa8e7d36b5ea8bfb949837890
Marigold: 9d67073f5e22e36de958493370b70a8a07220cce
Marigold-Extension: 9d14531bedcf301133ed570d0ad45f76403e0eef
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: efb313d8126259e9294dc4ee0002f44a6f676aba
Expand All @@ -1339,7 +1339,7 @@ SPEC CHECKSUMS:
React-jsitracing: 233d1a798fe0ff33b8e630b8f00f62c4a8115fbc
React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce
React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33
react-native-marigold: 0fe78359516a2449a398110703429639be0471cd
react-native-marigold: 9fdc1c9055d9a2cc8273bced416aa85408b49085
React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec
React-NativeModulesApple: 81bc2bcb4e7da59a9de76f3b70c796abf049702e
React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a
Expand All @@ -1365,6 +1365,6 @@ SPEC CHECKSUMS:
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Yoga: 348f8b538c3ed4423eb58a8e5730feec50bce372

PODFILE CHECKSUM: f62844141e7f9c67fafaedf763ab74d23388188b
PODFILE CHECKSUM: 5129da6403cb5216d6b77b26ea38ebfa8d913304

COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion ios/RNMarigold.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ @implementation RNMarigold

- (instancetype)init {
_marigold = [Marigold new];
[_marigold setWrapperName:@"React Native" andVersion:@"12.0.1"];
[_marigold setWrapperName:@"React Native" andVersion:@"13.0.0"];
return self;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"type": "git",
"url": "git+https://github.com/sailthru/sailthru-mobile-react-native-sdk.git"
},
"version": "12.0.1",
"version": "13.0.0",
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/preset-env": "^7.20.0",
Expand Down
6 changes: 3 additions & 3 deletions react-native-marigold.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Pod::Spec.new do |s|

s.authors = package['author']
s.homepage = package['homepage']
s.platforms = { :ios => "12.0" }
s.platforms = { :ios => "15.6" }

s.source = { :git => "https://github.com/sailthru/sailthru-mobile-react-native-sdk.git", :tag => "v#{s.version}" }
s.source_files = "ios/*.{h,m}"

s.dependency 'Marigold', '16.0.1'
s.dependency 'Marigold-Extension', '16.0.1'
s.dependency 'Marigold', '18.0.0'
s.dependency 'Marigold-Extension', '18.0.0'
s.dependency 'React-Core'
end

0 comments on commit c4e55d0

Please sign in to comment.