DeviceConnect · TakayukiHoshi1984 · Dec 4, 2017 · Oct 13, 2017 · Oct 16, 2017 · Oct 16, 2017
diff --git a/...PluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK.xcscheme b/...PluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK_framework.xcscheme b/...DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK_framework.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/Podfile.lock b/dConnectDevicePlugin/dConnectDeviceAWSIoT/Podfile.lock
@@ -12,4 +12,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e57f03e93e2bb0fafc6335552293afc70c7f47dc
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT.xcodeproj/project.pbxproj b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT.xcodeproj/project.pbxproj
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTUtils.m b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTUtils.m
@@ -443,7 +443,7 @@ + (NSString *)packageName {
 }
 
 // アラート表示
-+ (void)showAlert:(UIViewController*)vc title:(NSString*)title message:(NSString*)message handler:(void (^)())handler {
++ (void)showAlert:(UIViewController*)vc title:(NSString*)title message:(NSString*)message handler:(void (^)(void))handler {
 	UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
 																			 message:message
 																	  preferredStyle:UIAlertControllerStyleAlert];

diff --git a/...ePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTRelayClient.mm b/...ePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTRelayClient.mm
@@ -100,7 +100,6 @@ - (int) execute:(NSString *)address port:(int)port
         NSLog(@"DPAWSIoTRelayClient: connect: %s", UDT::getlasterror().getErrorMessage());
         return 0;
     }
-
     freeaddrinfo(peer);
 
     _socket = [[DPAWSIoTSocketTask alloc] initWithSocket:socket];

diff --git a/...cePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTSocketTask.mm b/...cePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTSocketTask.mm
@@ -8,7 +8,6 @@
 //
 
 #import "DPAWSIoTSocketTask.h"
-
 #define BUFFER_SIZE 512
 
 char const HEADER[4] = {
@@ -57,30 +56,26 @@ - (void) sendData:(const char *)data offset:(int)offset length:(int)length
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-
     if (length == 0) {
         return;
     }
-
     [self intToByte:length to:_sendBuffer];
-
     if (UDT::ERROR == UDT::send(_socket, HEADER, 4, 0)) {
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-
     if (UDT::ERROR == UDT::send(_socket, _sendBuffer, 4, 0)) {
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-
     int _offset = offset;
     int _length;
     while (_offset < offset + length) {
         _length = offset + length - _offset;
         if (_length > BUFFER_SIZE) {
             _length = BUFFER_SIZE;
         }
+
         if (UDT::ERROR == UDT::send(_socket, data + _offset, _length, 0)) {
             NSLog(@"DPAWSIoTSocketTask send error .");
             return;
@@ -96,26 +91,22 @@ - (void) execute
     if ([_delegate respondsToSelector:@selector(didConnectedAddress:port:)]) {
         [_delegate didConnectedAddress:_address port:_port];
     }
-
     while (!_closeFlag) {
         if (![self readHeader]) {
             NSLog(@"DPAWSIoTSocketTask header error.");
         }
-
         int size = [self readSize];
         if (size == -1) {
             NSLog(@"DPAWSIoTSocketTask size error.");
             break;
         }
-
         while (size > 0 && !_closeFlag) {
             int rs = UDT::recv(_socket, data, BUFFER_SIZE, 0);
             if (_closeFlag || UDT::ERROR == rs) {
                 NSLog(@"DPAWSIoTSocketTask UDT error...");
                 break;
             }
             size -= rs;
-
             if ([_delegate respondsToSelector:@selector(didReceivedData:length:)]) {
                 [_delegate didReceivedData:(const char *)data length:(int)rs];
             }

diff --git a/...cePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTStunClient.mm b/...cePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTStunClient.mm
@@ -41,7 +41,6 @@ - (instancetype) init
 - (void) bindingRequest:(StunBindingRequestCallback)callback
 {
     _callback = callback;
-
     if (_stunAddress) {
         [self doBindingRequest:_stunAddress];
     } else {
@@ -149,7 +148,7 @@ - (void) parse:(NSData *)data
     _cancelBlock = nil;
 
     if (_callback) {
-        _callback(ip, [port integerValue]);
+        _callback(ip, (int)[port integerValue]);
     }
 }
 
@@ -174,8 +173,8 @@ - (void) didConnect
     [request appendBytes:changeRequest length:sizeof(changeRequest)];
     [request appendBytes:attributeSize length:sizeof(attributeSize)];
     [request appendBytes:attributeBody length:sizeof(attributeBody)];
-    
-    [_server sendData:(const char *)[request bytes] length:[request length] to:_stunAddress port:_stunPort];
+
+    [_server sendData:(const char *)[request bytes] length:(int)[request length] to:_stunAddress port:_stunPort];
 }
 
 - (void) didNotConnect

diff --git a/...vicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/DPAWSIoTServerRunnable.m b/...vicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/DPAWSIoTServerRunnable.m
@@ -47,7 +47,7 @@ - (void) r:(NSData *)data
         if (headerSize > 0) {
             NSData *d = [self convHeader:_headerData];
             [self.connection sendData:d.bytes length:(int)d.length];
-            [self.connection sendData:data.bytes offset:headerSize length:data.length - headerSize];
+            [self.connection sendData:data.bytes offset:headerSize length:(int) (data.length - headerSize)];
             _headerEndFlag = YES;
         }
     } else {

diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/project.pbxproj b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/project.pbxproj
@@ -168,6 +168,7 @@
 		25F136481B67112600ADD8CB /* DPAllJoynColorUtility.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DPAllJoynColorUtility.mm; sourceTree = "<group>"; };
 		AB6F63171D8699A80027A2A2 /* dconnect_icon_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dconnect_icon_off.png; sourceTree = "<group>"; };
 		AB6F63181D8699A80027A2A2 /* dconnect_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dconnect_icon.png; sourceTree = "<group>"; };
+		AB9F67801FBACF98003A8EA0 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		ABC861A51BDA2B4A00E86FA9 /* libAllJoynFramework_iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libAllJoynFramework_iOS.a; path = deps/AllJoyn/darwin/arm/iphoneos/release/dist/about/lib/libAllJoynFramework_iOS.a; sourceTree = "<group>"; };
 		D6C860301D3A1D2000232EEF /* DPAllJoynService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPAllJoynService.h; sourceTree = "<group>"; };
 		D6C860311D3A1D2000232EEF /* DPAllJoynService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPAllJoynService.m; sourceTree = "<group>"; };
@@ -372,6 +373,7 @@
 				25851BF81B57CF3D00CB732E /* Download_on_the_App_Store_Badge_US-UK_135x40@2x.png */,
 				25851BF91B57CF3D00CB732E /* Download_on_the_App_Store_JP_135x40@2x.png */,
 				25851BF01B57C47900CB732E /* LIFX_Logo@2.jpg */,
+				AB9F67801FBACF98003A8EA0 /* module.modulemap */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -517,7 +519,7 @@
 		25A06BF31B562C07005B6F8A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "NTT DOCOMO, INC.";
 				TargetAttributes = {
 					25A06BFB1B562C07005B6F8A = {
@@ -759,12 +761,13 @@
 					"$(PROJECT_DIR)/deps/AllJoyn/darwin/arm/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/about/lib",
 					"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/lib",
 				);
+				MODULEMAP_FILE = dConnectDeviceAllJoyn/Resources/module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/dConnectDeviceAllJoyn/Headers";
-				VALID_ARCHS = "arm64 i386 armv7s armv7";
+				VALID_ARCHS = "arm64 armv7s armv7 i386";
 				VERSIONING_SYSTEM = "";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -830,12 +833,13 @@
 					"$(PROJECT_DIR)/deps/AllJoyn/darwin/arm/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/about/lib",
 					"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/lib",
 				);
+				MODULEMAP_FILE = dConnectDeviceAllJoyn/Resources/module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/dConnectDeviceAllJoyn/Headers";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "arm64 i386 armv7s armv7";
+				VALID_ARCHS = "arm64 armv7s armv7 i386";
 				VERSIONING_SYSTEM = "";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -872,7 +876,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				STRIP_STYLE = "non-global";
-				VALID_ARCHS = "arm64 i386 armv7s armv7";
+				VALID_ARCHS = "arm64 armv7s armv7 i386";
 			};
 			name = Debug;
 		};
@@ -908,7 +912,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				STRIP_STYLE = "non-global";
-				VALID_ARCHS = "arm64 i386 armv7s armv7";
+				VALID_ARCHS = "arm64 armv7s armv7 i386";
 			};
 			name = Release;
 		};

diff --git a/...ctDeviceAllJoyn.xcodeproj/xcshareddata/xcschemes/dConnectDeviceAllJoyn_framework.xcscheme b/...ctDeviceAllJoyn.xcodeproj/xcshareddata/xcschemes/dConnectDeviceAllJoyn_framework.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Resources/module.modulemap b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Resources/module.modulemap
@@ -0,0 +1,6 @@
+module dConnectDeviceAllJoyn {
+    umbrella ""
+    explicit module * {
+        export *
+    }
+}
diff --git a/...onnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/AJInterfaces/AJNLSFControllerService.mm b/...onnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/AJInterfaces/AJNLSFControllerService.mm
@@ -2277,7 +2277,7 @@ - (id)initWithBusAttachment:(AJNBusAttachment *)busAttachment onPath:(NSString *
         // add the signals to the interface description
         //
 
-        status = [interfaceDescription addSignalWithName:@"ControllerServiceLightingReset" inputSignature:@"" argumentNames:[NSArray arrayWithObjects: nil]];
+        status = [interfaceDescription addSignalWithName:@"ControllerServiceLightingReset" inputSignature:@"" argumentNames:@[]];
 
         if (status != ER_OK && status != ER_BUS_MEMBER_ALREADY_EXISTS) {
             @throw [NSException exceptionWithName:@"BusObjectInitFailed" reason:@"Unable to add signal to interface:  ControllerServiceLightingReset" userInfo:nil];
@@ -5394,4 +5394,4 @@ - (void)registerLSFControllerServiceLampGroupDelegateSignalHandler:(id<LSFContro
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
-
+
diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/DPAllJoynHandler.h b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/DPAllJoynHandler.h
@@ -39,7 +39,7 @@
                                     sessionID:(AJNSessionId)sessionID;
 - (NSDictionary *)discoveredAllJoynServices;
 
-- (void)postBlock:(void(^)())block
+- (void)postBlock:(void(^)(void))block
         withDelay:(int64_t)delayMillis;
 
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/deps/AllJoynFramework/AJNKeyStoreListenerImpl.h b/dConnectDevicePlugin/dConnectDeviceAllJoyn/deps/AllJoynFramework/AJNKeyStoreListenerImpl.h
@@ -14,7 +14,7 @@
 //    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ////////////////////////////////////////////////////////////////////////////////
 
-#import <alljoyn/KeystoreListener.h>
+#import <alljoyn/KeyStoreListener.h>
 #import "AJNKeyStoreListener.h"
 
 class AJNKeyStoreListenerImpl : public ajn::KeyStoreListener {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: e57f03e93e2bb0fafc6335552293afc70c7f47dc

		COCOAPODS: 1.2.0
		COCOAPODS: 1.3.1