Skip to content

Commit 32a60cf

Browse files
TakeoHatakeyamaTakeoHatakeyama
committed
Merge branch 'master' into modity_host_light_control_timing
2 parents b10ab2e + 8ae3e9e commit 32a60cf

359 files changed

Lines changed: 1424 additions & 11278 deletions

File tree

Some content is hidden

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

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
ABBD5F181987767500B81007 /* Project object */ = {
280280
isa = PBXProject;
281281
attributes = {
282-
LastUpgradeCheck = 0610;
282+
LastUpgradeCheck = 0900;
283283
ORGANIZATIONNAME = "NTT DOCOMO,INC.";
284284
TargetAttributes = {
285285
AB0E2E4D1A9471AF00A46DE1 = {
@@ -417,17 +417,29 @@
417417
CLANG_CXX_LIBRARY = "libc++";
418418
CLANG_ENABLE_MODULES = YES;
419419
CLANG_ENABLE_OBJC_ARC = YES;
420+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
420421
CLANG_WARN_BOOL_CONVERSION = YES;
422+
CLANG_WARN_COMMA = YES;
421423
CLANG_WARN_CONSTANT_CONVERSION = YES;
422424
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
423425
CLANG_WARN_EMPTY_BODY = YES;
424426
CLANG_WARN_ENUM_CONVERSION = YES;
427+
CLANG_WARN_INFINITE_RECURSION = YES;
425428
CLANG_WARN_INT_CONVERSION = YES;
429+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
430+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
426431
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
432+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
433+
CLANG_WARN_STRICT_PROTOTYPES = YES;
434+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
435+
CLANG_WARN_UNREACHABLE_CODE = YES;
427436
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
428437
COPY_PHASE_STRIP = NO;
438+
ENABLE_STRICT_OBJC_MSGSEND = YES;
439+
ENABLE_TESTABILITY = YES;
429440
GCC_C_LANGUAGE_STANDARD = gnu99;
430441
GCC_DYNAMIC_NO_PIC = NO;
442+
GCC_NO_COMMON_BLOCKS = YES;
431443
GCC_OPTIMIZATION_LEVEL = 0;
432444
GCC_PREPROCESSOR_DEFINITIONS = (
433445
"DEBUG=1",
@@ -440,7 +452,7 @@
440452
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
441453
GCC_WARN_UNUSED_FUNCTION = YES;
442454
GCC_WARN_UNUSED_VARIABLE = YES;
443-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
455+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
444456
ONLY_ACTIVE_ARCH = YES;
445457
SDKROOT = iphoneos;
446458
};
@@ -454,24 +466,35 @@
454466
CLANG_CXX_LIBRARY = "libc++";
455467
CLANG_ENABLE_MODULES = YES;
456468
CLANG_ENABLE_OBJC_ARC = YES;
469+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
457470
CLANG_WARN_BOOL_CONVERSION = YES;
471+
CLANG_WARN_COMMA = YES;
458472
CLANG_WARN_CONSTANT_CONVERSION = YES;
459473
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
460474
CLANG_WARN_EMPTY_BODY = YES;
461475
CLANG_WARN_ENUM_CONVERSION = YES;
476+
CLANG_WARN_INFINITE_RECURSION = YES;
462477
CLANG_WARN_INT_CONVERSION = YES;
478+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
479+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
463480
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
481+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
482+
CLANG_WARN_STRICT_PROTOTYPES = YES;
483+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
484+
CLANG_WARN_UNREACHABLE_CODE = YES;
464485
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
465486
COPY_PHASE_STRIP = YES;
466487
ENABLE_NS_ASSERTIONS = NO;
488+
ENABLE_STRICT_OBJC_MSGSEND = YES;
467489
GCC_C_LANGUAGE_STANDARD = gnu99;
490+
GCC_NO_COMMON_BLOCKS = YES;
468491
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
469492
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
470493
GCC_WARN_UNDECLARED_SELECTOR = YES;
471494
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
472495
GCC_WARN_UNUSED_FUNCTION = YES;
473496
GCC_WARN_UNUSED_VARIABLE = YES;
474-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
497+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
475498
SDKROOT = iphoneos;
476499
VALIDATE_PRODUCT = YES;
477500
};
@@ -524,6 +547,7 @@
524547
"$(inherited)",
525548
);
526549
INFOPLIST_FILE = "DCMDevicePluginSDKTests/DCMDevicePluginSDKTests-Info.plist";
550+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.deviceplugin.profile.${PRODUCT_NAME:rfc1034identifier}";
527551
PRODUCT_NAME = "$(TARGET_NAME)";
528552
WRAPPER_EXTENSION = xctest;
529553
};
@@ -540,6 +564,7 @@
540564
GCC_PRECOMPILE_PREFIX_HEADER = YES;
541565
GCC_PREFIX_HEADER = "DCMDevicePluginSDK/DCMDevicePluginSDK-Prefix.pch";
542566
INFOPLIST_FILE = "DCMDevicePluginSDKTests/DCMDevicePluginSDKTests-Info.plist";
567+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.deviceplugin.profile.${PRODUCT_NAME:rfc1034identifier}";
543568
PRODUCT_NAME = "$(TARGET_NAME)";
544569
WRAPPER_EXTENSION = xctest;
545570
};

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK_framework.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDKTests/DCMDevicePluginSDKTests-Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>NSHumanReadableCopyright</key>
6-
<string>Copyright (c) 2014 NTT DOCOMO, INC. Released under the MIT license.</string>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>en</string>
97
<key>CFBundleExecutable</key>
108
<string>${EXECUTABLE_NAME}</string>
119
<key>CFBundleIdentifier</key>
12-
<string>org.deviceconnect.deviceplugin.profile.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1311
<key>CFBundleInfoDictionaryVersion</key>
1412
<string>6.0</string>
1513
<key>CFBundlePackageType</key>
@@ -20,5 +18,7 @@
2018
<string>????</string>
2119
<key>CFBundleVersion</key>
2220
<string>1</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>Copyright (c) 2014 NTT DOCOMO, INC. Released under the MIT license.</string>
2323
</dict>
2424
</plist>

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
25A06BF31B562C07005B6F8A /* Project object */ = {
518518
isa = PBXProject;
519519
attributes = {
520-
LastUpgradeCheck = 0640;
520+
LastUpgradeCheck = 0900;
521521
ORGANIZATIONNAME = "NTT DOCOMO, INC.";
522522
TargetAttributes = {
523523
25A06BFB1B562C07005B6F8A = {
@@ -697,13 +697,21 @@
697697
ALWAYS_SEARCH_USER_PATHS = NO;
698698
CLANG_ENABLE_MODULES = YES;
699699
CLANG_ENABLE_OBJC_ARC = YES;
700+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
700701
CLANG_WARN_BOOL_CONVERSION = YES;
702+
CLANG_WARN_COMMA = YES;
701703
CLANG_WARN_CONSTANT_CONVERSION = YES;
702704
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
703705
CLANG_WARN_EMPTY_BODY = YES;
704706
CLANG_WARN_ENUM_CONVERSION = YES;
707+
CLANG_WARN_INFINITE_RECURSION = YES;
705708
CLANG_WARN_INT_CONVERSION = YES;
709+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
710+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
706711
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
712+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
713+
CLANG_WARN_STRICT_PROTOTYPES = YES;
714+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
707715
CLANG_WARN_UNREACHABLE_CODE = YES;
708716
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
709717
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -712,6 +720,7 @@
712720
COPY_PHASE_STRIP = NO;
713721
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
714722
ENABLE_STRICT_OBJC_MSGSEND = YES;
723+
ENABLE_TESTABILITY = YES;
715724
FRAMEWORK_SEARCH_PATHS = (
716725
"$(inherited)",
717726
"$(PROJECT_DIR)/../../dConnectSDK/dConnectSDKForIOS/bin",
@@ -743,14 +752,15 @@
743752
"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/inc/alljoyn",
744753
"$(PROJECT_DIR)/deps/AllJoynFramework",
745754
);
746-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
755+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
747756
LIBRARY_SEARCH_PATHS = (
748757
"$(inherited)",
749758
"$(PROJECT_DIR)/deps/CocoaPods/Pods/OpenSSL-Static/lib-ios",
750759
"$(PROJECT_DIR)/deps/AllJoyn/darwin/arm/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/about/lib",
751760
"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/lib",
752761
);
753762
MTL_ENABLE_DEBUG_INFO = YES;
763+
ONLY_ACTIVE_ARCH = YES;
754764
SDKROOT = iphoneos;
755765
TARGETED_DEVICE_FAMILY = "1,2";
756766
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/dConnectDeviceAllJoyn/Headers";
@@ -766,13 +776,21 @@
766776
ALWAYS_SEARCH_USER_PATHS = NO;
767777
CLANG_ENABLE_MODULES = YES;
768778
CLANG_ENABLE_OBJC_ARC = YES;
779+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
769780
CLANG_WARN_BOOL_CONVERSION = YES;
781+
CLANG_WARN_COMMA = YES;
770782
CLANG_WARN_CONSTANT_CONVERSION = YES;
771783
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
772784
CLANG_WARN_EMPTY_BODY = YES;
773785
CLANG_WARN_ENUM_CONVERSION = YES;
786+
CLANG_WARN_INFINITE_RECURSION = YES;
774787
CLANG_WARN_INT_CONVERSION = YES;
788+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
789+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
775790
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
791+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
792+
CLANG_WARN_STRICT_PROTOTYPES = YES;
793+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
776794
CLANG_WARN_UNREACHABLE_CODE = YES;
777795
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
778796
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -805,7 +823,7 @@
805823
"$(PROJECT_DIR)/deps/AllJoyn/darwin/$(CURRENT_ARCH)/$(PLATFORM_NAME)/$(CONFIGURATION)/dist/cpp/inc/alljoyn",
806824
"$(PROJECT_DIR)/deps/AllJoynFramework",
807825
);
808-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
826+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
809827
LIBRARY_SEARCH_PATHS = (
810828
"$(inherited)",
811829
"$(PROJECT_DIR)/deps/CocoaPods/Pods/OpenSSL-Static/lib-ios",
@@ -826,6 +844,7 @@
826844
25A06C131B562C08005B6F8A /* Debug */ = {
827845
isa = XCBuildConfiguration;
828846
buildSettings = {
847+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
829848
CURRENT_PROJECT_VERSION = "";
830849
DEFINES_MODULE = YES;
831850
DYLIB_INSTALL_NAME_BASE = "";
@@ -849,6 +868,7 @@
849868
);
850869
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
851870
OTHER_LIBTOOLFLAGS = "-lssl -lcrypto";
871+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)";
852872
PRODUCT_NAME = "$(TARGET_NAME)";
853873
SKIP_INSTALL = YES;
854874
STRIP_STYLE = "non-global";
@@ -859,6 +879,7 @@
859879
25A06C141B562C08005B6F8A /* Release */ = {
860880
isa = XCBuildConfiguration;
861881
buildSettings = {
882+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
862883
CURRENT_PROJECT_VERSION = "";
863884
DEFINES_MODULE = YES;
864885
DYLIB_INSTALL_NAME_BASE = "";
@@ -883,6 +904,7 @@
883904
);
884905
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
885906
OTHER_LIBTOOLFLAGS = "-lssl -lcrypto";
907+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)";
886908
PRODUCT_NAME = "$(TARGET_NAME)";
887909
SKIP_INSTALL = YES;
888910
STRIP_STYLE = "non-global";
@@ -899,6 +921,7 @@
899921
);
900922
INFOPLIST_FILE = "dConnectDeviceAllJoynTests/Supporting Files/Info.plist";
901923
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
924+
PRODUCT_BUNDLE_IDENTIFIER = "com.nttdocomo.$(PRODUCT_NAME:rfc1034identifier)";
902925
PRODUCT_NAME = "$(TARGET_NAME)";
903926
};
904927
name = Debug;
@@ -908,6 +931,7 @@
908931
buildSettings = {
909932
INFOPLIST_FILE = "dConnectDeviceAllJoynTests/Supporting Files/Info.plist";
910933
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
934+
PRODUCT_BUNDLE_IDENTIFIER = "com.nttdocomo.$(PRODUCT_NAME:rfc1034identifier)";
911935
PRODUCT_NAME = "$(TARGET_NAME)";
912936
};
913937
name = Release;
@@ -966,6 +990,7 @@
966990
INFOPLIST_FILE = dConnectDeviceAllJoyn_resources/Info.plist;
967991
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
968992
MACOSX_DEPLOYMENT_TARGET = 10.10;
993+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)";
969994
PRODUCT_NAME = "$(TARGET_NAME)";
970995
SDKROOT = iphoneos;
971996
SKIP_INSTALL = YES;
@@ -982,6 +1007,7 @@
9821007
INFOPLIST_FILE = dConnectDeviceAllJoyn_resources/Info.plist;
9831008
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
9841009
MACOSX_DEPLOYMENT_TARGET = 10.10;
1010+
PRODUCT_BUNDLE_IDENTIFIER = "org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)";
9851011
PRODUCT_NAME = "$(TARGET_NAME)";
9861012
SDKROOT = iphoneos;
9871013
SKIP_INSTALL = YES;

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/xcshareddata/xcschemes/dConnectDeviceAllJoyn_framework.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0640"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Supporting Files/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoynTests/Supporting Files/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.nttdocomo.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn_resources/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>CFBundleDevelopmentRegion</key>
66
<string>ja_JP</string>
77
<key>CFBundleIdentifier</key>
8-
<string>org.deviceconnect.ios.$(PRODUCT_NAME:rfc1034identifier)</string>
8+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
99
<key>CFBundleInfoDictionaryVersion</key>
1010
<string>6.0</string>
1111
<key>CFBundleName</key>

0 commit comments

Comments
 (0)