Skip to content

Commit 717c59a

Browse files
cristina-suciucristina-suciu
authored
Merge pull request #16 from dji-sdk/dji-sdk/dji_uxsdk_5.0_beta_4
UXSDK 5.0-b4 release code
2 parents 4e40502 + d36f840 commit 717c59a

File tree

826 files changed

+20878
-6394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

826 files changed

+20878
-6394
lines changed

‎DJI-UXSDK-iOS-Beta-Accessory.podspec

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'DJI-UXSDK-iOS-Beta-Accessory'
3+
s.version = '0.4.0'
4+
s.license = 'MIT'
5+
s.summary = 'Accessory utilities for DJI iOS UX SDK.'
6+
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
7+
s.authors = { 'DJI' => 'dev@dji.com' }
8+
s.documentation_url = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS/wiki'
9+
s.ios.deployment_target = '11.0'
10+
s.requires_arc = true
11+
s.swift_version = '5.0'
12+
s.module_name = 'UXSDKAccessory'
13+
s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC -all_load' }
14+
s.source = { :git => 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS.git', :tag => s.version.to_s }
15+
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES'}
16+
s.cocoapods_version = '>= 1.7.1'
17+
s.source_files = 'UXSDKAccessory/**/*.{h,m,swift}'
18+
s.resource_bundle = { 'UXSDKAccessoryAssets' => 'UXSDKAccessory/**/*.{xcassets,html,otf}' }
19+
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '~> 0.4'
20+
end

‎DJI-UXSDK-iOS-Beta-Core.podspec

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'DJI-UXSDK-iOS-Beta-Core'
3-
s.version = '0.3'
3+
s.version = '0.4.0'
44
s.license = 'MIT'
55
s.summary = 'Core utilities for DJI iOS UX SDK.'
66
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
@@ -9,12 +9,13 @@ Pod::Spec.new do |s|
99
s.ios.deployment_target = '11.0'
1010
s.requires_arc = true
1111
s.swift_version = '5.0'
12-
s.module_name = 'DJIUXSDKCore'
12+
s.module_name = 'UXSDKCore'
1313
s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC -all_load' }
1414
s.source = { :git => 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS.git', :tag => s.version.to_s }
1515
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES'}
1616
s.cocoapods_version = '>= 1.7.1'
17-
s.source_files = 'DJIUXSDKCore/**/*.{h,m,swift}'
18-
s.dependency 'DJI-SDK-iOS', '~> 4.13'
19-
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.3'
17+
s.source_files = 'UXSDKCore/**/*.{h,m,swift}'
18+
s.resource_bundle = { 'UXSDKCoreAssets' => 'UXSDKCore/**/*.{xcassets,html,otf}' }
19+
s.dependency 'DJI-SDK-iOS', '~> 4.14-trial1'
20+
s.dependency 'DJIWidget', '~> 1.6.4'
2021
end

‎DJI-UXSDK-iOS-Beta-Widgets.podspec renamed to ‎DJI-UXSDK-iOS-Beta-Flight.podspec

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
Pod::Spec.new do |s|
2-
s.name = 'DJI-UXSDK-iOS-Beta-Widgets'
3-
s.version = '0.3'
2+
s.name = 'DJI-UXSDK-iOS-Beta-Flight'
3+
s.version = '0.4.0'
44
s.license = 'MIT'
5-
s.summary = 'A collection of widget, widget model, and related helpers for DJI iOS UX SDK.'
5+
s.summary = 'Flight utilities for DJI iOS UX SDK.'
66
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
77
s.authors = { 'DJI' => 'dev@dji.com' }
88
s.documentation_url = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS/wiki'
99
s.ios.deployment_target = '11.0'
1010
s.requires_arc = true
1111
s.swift_version = '5.0'
12-
s.module_name = 'DJIUXSDKWidgets'
12+
s.module_name = 'UXSDKFlight'
1313
s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC -all_load' }
1414
s.source = { :git => 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS.git', :tag => s.version.to_s }
15-
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES' }
15+
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES'}
1616
s.cocoapods_version = '>= 1.7.1'
17-
s.source_files = 'DJIUXSDKWidgets/**/*.{h,m,swift}'
18-
s.resource_bundle = { 'DUXBetaAssets' => 'DJIUXSDKWidgets/**/*.{xcassets,html,otf}' }
19-
s.dependency 'DJI-SDK-iOS', '~> 4.13'
20-
s.dependency 'DJIWidget', '~> 1.6.3'
21-
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.3'
22-
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.3'
17+
s.source_files = 'UXSDKFlight/**/*.{h,m,swift}'
18+
s.resource_bundle = { 'UXSDKFlightAssets' => 'UXSDKFlight/**/*.{xcassets,html,otf}' }
19+
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '~> 0.4'
2320
end

‎DJI-UXSDK-iOS-Beta-Communication.podspec renamed to ‎DJI-UXSDK-iOS-Beta-Map.podspec

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
Pod::Spec.new do |s|
2-
s.name = 'DJI-UXSDK-iOS-Beta-Communication'
3-
s.version = '0.3'
2+
s.name = 'DJI-UXSDK-iOS-Beta-Map'
3+
s.version = '0.4.0'
44
s.license = 'MIT'
5-
s.summary = 'Intra-framework, and system communication infrastructure for DJI iOS UX SDK.'
5+
s.summary = 'Map utilities for DJI iOS UX SDK.'
66
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
77
s.authors = { 'DJI' => 'dev@dji.com' }
88
s.documentation_url = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS/wiki'
99
s.ios.deployment_target = '11.0'
1010
s.requires_arc = true
1111
s.swift_version = '5.0'
12-
s.module_name = 'DJIUXSDKCommunication'
12+
s.module_name = 'UXSDKMap'
1313
s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC -all_load' }
1414
s.source = { :git => 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS.git', :tag => s.version.to_s }
1515
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES'}
1616
s.cocoapods_version = '>= 1.7.1'
17-
s.source_files = 'DJIUXSDKCommunication/**/*.{h,swift}'
18-
end
17+
s.source_files = 'UXSDKMap/**/*.{h,m,swift}'
18+
s.resource_bundle = { 'UXSDKMapAssets' => 'UXSDKMap/**/*.{xcassets,html,otf}' }
19+
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '~> 0.4'
20+
end

‎DJI-UXSDK-iOS-Beta.podspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'DJI-UXSDK-iOS-Beta'
3-
s.version = '0.3'
3+
s.version = '0.4'
44
s.license = 'MIT'
55
s.summary = 'DJI iOS UX SDK'
66
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
@@ -15,7 +15,8 @@ Pod::Spec.new do |s|
1515
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES'}
1616
s.cocoapods_version = '>= 1.7.1'
1717
s.source_files = 'DJIUXSDKBeta/**/*.{h,m,swift}'
18-
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.3'
19-
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.3'
20-
s.dependency 'DJI-UXSDK-iOS-Beta-Widgets', '0.3'
18+
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.4'
19+
s.dependency 'DJI-UXSDK-iOS-Beta-Flight', '0.4'
20+
s.dependency 'DJI-UXSDK-iOS-Beta-Accessory', '0.4'
21+
s.dependency 'DJI-UXSDK-iOS-Beta-Map', '0.4'
2122
end

‎DJIUXSDKBeta/DJIUXSDK.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ FOUNDATION_EXPORT const unsigned char DJIUXSDKVersionString[];
3636

3737
// In this header, you should import all the public headers of your framework using statements like #import <DJIUXSDK/PublicHeader.h>
3838

39-
#import <DJIUXSDKCore/DJIUXSDKCore.h>
40-
#import <DJIUXSDKCommunication/DJIUXSDKCommunication.h>
41-
#import <DJIUXSDKWidgets/DJIUXSDKWidgets.h>
39+
#import <UXSDKCore/UXSDKCore.h>
40+
#import <UXSDKFlight/UXSDKFlight.h>
41+
#import <UXSDKMap/UXSDKMap.h>
42+
#import <UXSDKAccessory/UXSDKAccessory.h>

‎DJIUXSDKCore/DJIUXSDKCore.h

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎DJIUXSDKCore/HelperCategories/UIColor+DUXBetaColors.h

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)