Merge pull request #93 from dji-sdk/sdk_releases/4.14

Final podspec and podfiles for samples for 4.14
dji-sdk · Feb 25, 2021 · 50ebbc5 · 50ebbc5
2 parents 4df7246 + be596c6
commit 50ebbc5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/DJI-UXSDK-iOS.podspec b/DJI-UXSDK-iOS.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name            = "DJI-UXSDK-iOS"
-  s.version         = "4.14-trial1"
+  s.version         = "4.14"
   s.summary         = "DJI UX SDK for iOS"
   s.homepage        = "https://github.com/dji-sdk/Mobile-UXSDK-iOS"
   s.license         = { :type => 'CUSTOM', :text => <<-LICENSE
@@ -38,8 +38,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   s.author          = { "DJI SDK" => "dev@dji.com" }
   s.platform        = :ios, '10.0'
   s.requires_arc    = true
-  s.source       = { :http => "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/iOS_UX_SDK_4.14-trial1_20201210.zip" }
+  s.source       = { :http => "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/iOS_UX_SDK_4.14_20210223.zip" }
 
   s.ios.vendored_frameworks = 'iOS_UX_SDK/DJIUXSDK.framework'
 
+  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => "arm64 armv7 i386" }
+  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => "arm64 armv7 i386" }
+
 end
diff --git a/Sample Code/ObjcSampleCode/Podfile b/Sample Code/ObjcSampleCode/Podfile
@@ -2,9 +2,9 @@ platform :ios, '10.0'
 
 target 'UXSDKOCSample' do
   use_frameworks!
-  pod 'DJI-SDK-iOS', '~> 4.14-trial1'
-  pod 'DJI-UXSDK-iOS', '~> 4.14-trial1'
-  pod 'DJIWidget', '~> 1.6.3'
-  pod 'DJIFlySafeDatabaseResource', '~> 01.00.01.17'
+  pod 'DJI-SDK-iOS', '~> 4.14'
+  pod 'DJI-UXSDK-iOS', '~> 4.14'
+  pod 'DJIWidget', '~> 1.6.4'
+  pod 'DJIFlySafeDatabaseResource', '~> 01.00.01.18'
 
 end
diff --git a/Sample Code/SwiftSampleCode/Podfile b/Sample Code/SwiftSampleCode/Podfile
@@ -2,9 +2,9 @@ platform :ios, '10.0'
 
 target 'UXSDKSwiftSample' do
   use_frameworks!
-  pod 'DJI-SDK-iOS', '~> 4.14-trial1'
-  pod 'DJI-UXSDK-iOS', '~> 4.14-trial1'
-  pod 'DJIWidget', '~> 1.6.3'
-  pod 'DJIFlySafeDatabaseResource', '~> 01.00.01.17'
+  pod 'DJI-SDK-iOS', '~> 4.14'
+  pod 'DJI-UXSDK-iOS', '~> 4.14'
+  pod 'DJIWidget', '~> 1.6.4'
+  pod 'DJIFlySafeDatabaseResource', '~> 01.00.01.18'
   pod 'iOS-Color-Picker'
 end