Merge pull request #167 from TakayukiHoshi1984/modify_irkit_info_plist

TakayukiHoshi1984 · web-flow · commit ca8185298774 · 2017-10-18T19:16:26.000+09:00
IRKitのInfo.plistが追加されていない件の修正
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTDevicePlugin.m
@@ -95,5 +95,9 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
-
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceAWSIoT_resources" ofType:@"bundle"]];
+}
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/DPAllJoynDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/DPAllJoynDevicePlugin.m
@@ -70,4 +70,10 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceAllJoyn_resources" ofType:@"bundle"]];
+}
+
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/Profiles/DPAllJoynSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/Profiles/DPAllJoynSystemProfile.m
@@ -59,11 +59,6 @@ + (instancetype) systemProfileWithVersion:(NSString *)version {
 #pragma mark DConnectSystemProfileDataSource
 
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile
-{
-    return _version;
-}
-
 
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
diff --git a/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn_resources/Info.plist b/dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn_resources/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast.xcodeproj/project.pbxproj b/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast.xcodeproj/project.pbxproj
@@ -55,6 +55,7 @@
 		ABA304001D7FC84F00B1CEEB /* GoogleCastResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = ABA303FF1D7FC84F00B1CEEB /* GoogleCastResources.bundle */; };
 		ABAC40451D7E9E2600BBDD34 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAC40441D7E9E2600BBDD34 /* CoreBluetooth.framework */; };
 		ABAC40471D7E9E3600BBDD34 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAC40461D7E9E3600BBDD34 /* Accelerate.framework */; };
+		ABC49C401F97436300DC9339 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC5E3D31A9736F9003D2634 /* Info.plist */; };
 		ABC5E3E41A973741003D2634 /* DPChromecastDevicePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC5E3E11A973741003D2634 /* DPChromecastDevicePlugin.m */; };
 		ABC5E3EA1A97375D003D2634 /* DPChromecastGuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC5E3E71A97375D003D2634 /* DPChromecastGuideViewController.m */; };
 		ABC5E3EB1A97375D003D2634 /* DPChromecastSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC5E3E91A97375D003D2634 /* DPChromecastSettingViewController.m */; };
@@ -624,6 +625,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ABC49C401F97436300DC9339 /* Info.plist in Resources */,
 				ABCB4A511AB53E0100805F25 /* icon-cast-connected.png in Resources */,
 				AB311FDA1D7E879100B2D886 /* CastComponents.storyboard in Resources */,
 				ABCB4A521AB53E0100805F25 /* icon-cast-identified.png in Resources */,
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastDevicePlugin.m
@@ -95,6 +95,11 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceChromecast_resources" ofType:@"bundle"]];
+}
 
 @end
 
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastSystemProfile.m
@@ -56,11 +56,6 @@ - (id)init
     return self;
 }
 
-// デバイスプラグインのバージョン
--(NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile
-{
-    return @"2.0.0";
-}
 
 // デバイスプラグインの設定画面用のUIViewControllerを要求する
 -(UIViewController *) profile:(DConnectSystemProfile *)sender
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Resources/Info.plist b/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Resources/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/DPHitoeDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/DPHitoeDevicePlugin.m
@@ -228,5 +228,10 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     return [bundle pathForResource:filename ofType:@"png"];
     return nil;
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceHitoe_resources" ofType:@"bundle"]];
+}
 
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/Profile/DPHitoeSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceHitoe/dConnectDeviceHitoe/Classes/Profile/DPHitoeSystemProfile.m
@@ -77,10 +77,6 @@ - (instancetype)init
 
 #pragma mark - DConnectSystemProfileDataSource
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile {
-    return @"1.0.0";
-}
-
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
 {
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/DPHostDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/DPHostDevicePlugin.m
@@ -52,4 +52,9 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     return [bundle pathForResource:filename ofType:@"png"];
 }
 
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceHost_resources" ofType:@"bundle"]];
+}
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostSystemProfile.m
@@ -65,10 +65,6 @@ - (instancetype)init
 
 #pragma mark - DConnectSystemProfileDataSource
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile {
-    return @"2.0.0";
-}
-
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
 {
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost_resources/dConnectDeviceHost_resources-Info.plist b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost_resources/dConnectDeviceHost_resources-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue/Classes/DPHueDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue/Classes/DPHueDevicePlugin.m
@@ -80,5 +80,9 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
-
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceHue_resources" ofType:@"bundle"]];
+}
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue/Classes/DPHueSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue/Classes/DPHueSystemProfile.m
@@ -35,10 +35,6 @@ - (id)init
     return self;
 }
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile
-{
-    return @"2.0.0";
-}
 
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
diff --git a/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue_resources/dConnectDeviceHue_resources-Info.plist b/dConnectDevicePlugin/dConnectDeviceHue/dConnectDeviceHue_resources/dConnectDeviceHue_resources-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit.xcodeproj/project.pbxproj b/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit.xcodeproj/project.pbxproj
@@ -68,6 +68,7 @@
 		AB056FA11B6B1A2800E1482F /* DCMDevicePluginSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB056FA01B6B1A2800E1482F /* DCMDevicePluginSDK.framework */; };
 		AB056FA71B6B51DE00E1482F /* DPIRKitLightProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = AB056FA61B6B51DE00E1482F /* DPIRKitLightProfile.m */; };
 		AB056FAA1B6B5D0200E1482F /* DPIRKitTVProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = AB056FA91B6B5D0200E1482F /* DPIRKitTVProfile.m */; };
+		AB4A50A01F96EECA0074912E /* dConnectDeviceIRKit-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 30A0A33219A5932700822B73 /* dConnectDeviceIRKit-Info.plist */; };
 		AB4B68FC19B4671D009939C9 /* irkit01.png in Resources */ = {isa = PBXBuildFile; fileRef = AB4B68F419B4671D009939C9 /* irkit01.png */; };
 		AB4B68FD19B4671D009939C9 /* irkit02.png in Resources */ = {isa = PBXBuildFile; fileRef = AB4B68F519B4671D009939C9 /* irkit02.png */; };
 		AB4B68FE19B4671D009939C9 /* irkit03.png in Resources */ = {isa = PBXBuildFile; fileRef = AB4B68F619B4671D009939C9 /* irkit03.png */; };
@@ -642,6 +643,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AB4A50A01F96EECA0074912E /* dConnectDeviceIRKit-Info.plist in Resources */,
 				8EB8544D1D42403E0035C0DC /* dconnect_icon.png in Resources */,
 				AB8658021B82FF4900A0F896 /* light.png in Resources */,
 				AB8658031B82FF4900A0F896 /* tv.png in Resources */,
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/DPIRKitDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Classes/DPIRKitDevicePlugin.m
@@ -88,7 +88,7 @@ - (id) init {
         [_eventManager setController:controller];
         NSString* path = [DPIRBundle() pathForResource:DPIRKitInfoPlistName ofType:@"plist"];
         NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:path];
-        _version = info[DPIRKitInfoVersion];
+//        _version = info[DPIRKitInfoVersion];
         __weak typeof(self) _self = self;
         dispatch_async(dispatch_get_main_queue(), ^{
             NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
@@ -334,10 +334,6 @@ - (BOOL) existIRForServiceId:(NSString *)serviceId {
 
 #pragma mark DConnectSystemProfileDataSource
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile {
-    return _version;
-}
-
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
 {
@@ -488,4 +484,10 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceIRKit_resources" ofType:@"bundle"]];
+}
+
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Resources/dConnectDeviceIRKit-Info.plist b/dConnectDevicePlugin/dConnectDeviceIRKit/dConnectDeviceIRKit/Resources/dConnectDeviceIRKit-Info.plist
@@ -2,10 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>DPIRKitVersion</key>
+	<key>CFBundleShortVersionString</key>
 	<string>2.0.0</string>
 	<key>DPIRKitAPIKey</key>
 	<string>[YOUR APPLICATION KEY]</string>
+	<key>DPIRKitVersion</key>
+	<string>2.0.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (c) 2014 NTT DOCOMO, INC. Released under the MIT license.</string>
 </dict>
diff --git a/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/DPLinkingDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/DPLinkingDevicePlugin.m
@@ -24,7 +24,7 @@ - (id) init
         [[DConnectEventManager sharedManagerForClass:[self class]] setController:ctl];
 
         [self addProfile:[[DPLinkingServiceDiscoveryProfile alloc] initWithServiceProvider: self.serviceProvider]];
-        [self addProfile:[DPLinkingSystemProfile systemProfileWithVersion:@"1.0"]];
+        [self addProfile:[DPLinkingSystemProfile systemProfile]];
 
         __weak typeof(self) weakSelf = self;
         
@@ -54,4 +54,9 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     return nil;
 }
 
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceLinking_resources" ofType:@"bundle"]];
+}
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/profile/DPLinkingSystemProfile.h b/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/profile/DPLinkingSystemProfile.h
@@ -11,6 +11,6 @@
 
 @interface DPLinkingSystemProfile : DConnectSystemProfile
 
-+ (instancetype) systemProfileWithVersion:(NSString *)version;
++ (instancetype) systemProfile;
 
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/profile/DPLinkingSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceLinking/dConnectDeviceLinking/Classes/profile/DPLinkingSystemProfile.m
@@ -36,17 +36,13 @@ - (instancetype) initWithVersion:(NSString *)version
     return self;
 }
 
-+ (instancetype) systemProfileWithVersion:(NSString *)version
++ (instancetype) systemProfile
 {
-    return [[DPLinkingSystemProfile alloc] initWithVersion:version];
+    return [[DPLinkingSystemProfile alloc] init];
 }
 
 #pragma mark - DConnectSystemProfileDataSource
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile
-{
-    return _version;
-}
 
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
diff --git a/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble/Classes/DPPebbleDevicePlugin.m b/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble/Classes/DPPebbleDevicePlugin.m
@@ -31,7 +31,7 @@ - (instancetype) init
 		// EventManagerの初期化
 		Class key = [self class];
 		[[DConnectEventManager sharedManagerForClass:key] setController:[DConnectMemoryCacheController new]];
-		
+
         // DPPebbleManagerへServiceProviderを渡す
         [[DPPebbleManager sharedManager] setServiceProvider: self.serviceProvider];
         [[DPPebbleManager sharedManager] setPlugin: self];
@@ -83,5 +83,10 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDevicePebble_resources" ofType:@"bundle"]];
+}
 
 @end
diff --git a/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble/Classes/profile/DPPebbleSystemProfile.m b/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble/Classes/profile/DPPebbleSystemProfile.m
@@ -59,11 +59,6 @@ - (id)init
 
 #pragma mark - DConnectSystemProfileDelegate & DataSource
 
-// デバイスプラグインのバージョン
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile {
-	return @"2.0.0";
-}
-
 // 設定画面用のUIViewController
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
diff --git a/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble_resources/dConnectDevicePebble_resources-Info.plist b/dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble_resources/dConnectDevicePebble_resources-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraDevicePlugin.m
@@ -136,5 +136,10 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceSonyCamera_resources" ofType:@"bundle"]];
+}
 
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/profile/SonyCameraSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/profile/SonyCameraSystemProfile.m
@@ -14,10 +14,6 @@
 #import "SonyCameraViewController.h"
 #import "SonyCameraManager.h"
 
-/*!
- @brief バージョン。
- */
-NSString *const SonyDevicePluginVersion = @"2.0.0";
 
 
 @interface SonyCameraSystemProfile ()
@@ -81,10 +77,6 @@ - (BOOL) didReceiveDeleteEventsRequest:(DConnectRequestMessage *)request respons
 
 #pragma mark - DConnectSystemProfileDataSource
 
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile {
-    return SonyDevicePluginVersion;
-}
-
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
 {
diff --git a/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera_resources/dConnectDeviceSonyCamera_resources-Info.plist b/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera_resources/dConnectDeviceSonyCamera_resources-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroDevicePlugin.m
@@ -80,6 +80,11 @@ - (NSString*)iconFilePath:(BOOL)isOnline
     NSString* filename = isOnline ? @"dconnect_icon" : @"dconnect_icon_off";
     return [bundle pathForResource:filename ofType:@"png"];
 }
+#pragma mark - DevicePlugin's bundle
+- (NSBundle*)pluginBundle
+{
+    return [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"dConnectDeviceSphero_resources" ofType:@"bundle"]];
+}
 
 - (void) dealloc {
     
diff --git a/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroSystemProfile.m
@@ -57,12 +57,6 @@ - (id)init
     return self;
 }
 
-// デバイスプラグインのバージョン
-- (NSString *) versionOfSystemProfile:(DConnectSystemProfile *)profile
-{
-    return @"2.0.0";
-}
-
 // デバイスプラグインの設定画面用のUIViewControllerを要求する
 - (UIViewController *) profile:(DConnectSystemProfile *)sender
          settingPageForRequest:(DConnectRequestMessage *)request
diff --git a/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero_resources/dConnectDeviceSphero_resources-Info.plist b/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero_resources/dConnectDeviceSphero_resources-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestSystemProfile.h b/dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestSystemProfile.h
diff --git a/dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestSystemProfile.m
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaDevicePlugin.m b/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetaDevicePlugin.m
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetatSystemProfile.m b/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPThetatSystemProfile.m
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta_resources/Info.plist b/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta_resources/Info.plist
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectDevicePlugin.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectDevicePlugin.m
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectManagerSystemProfile.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectManagerSystemProfile.m
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectDevicePlugin.h b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectDevicePlugin.h
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectSystemProfile.h b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK/DConnectSystemProfile.h
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDKTests/DConnectManager/NormalTestDevicePlugin/TestDevicePlugin.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDKTests/DConnectManager/NormalTestDevicePlugin/TestDevicePlugin.m

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,6 @@ - (instancetype)init`
`77`	`77`
`78`	`78`	`#pragma mark - DConnectSystemProfileDataSource`
`79`	`79`
`80`		`-- (NSString ) versionOfSystemProfile:(DConnectSystemProfile )profile {`
`81`		`- return @"1.0.0";`
`82`		`-}`
`83`		`-`
`84`	`80`	`- (UIViewController ) profile:(DConnectSystemProfile )sender`
`85`	`81`	`settingPageForRequest:(DConnectRequestMessage *)request`
`86`	`82`	`{`