Skip to content

Commit e68673d

Browse files
須藤将史須藤将史
authored andcommitted
apply recommended project settings
1 parent 2dda702 commit e68673d

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

Demo/StudyplusSDKDemo/StudyplusSDKDemo.xcodeproj/project.pbxproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
4388599218B1E90A0063BBC8 /* Project object */ = {
382382
isa = PBXProject;
383383
attributes = {
384-
LastUpgradeCheck = 0500;
384+
LastUpgradeCheck = 0730;
385385
ORGANIZATIONNAME = studyplus.jp;
386386
TargetAttributes = {
387387
438859BA18B1E90A0063BBC8 = {
@@ -515,7 +515,6 @@
515515
isa = XCBuildConfiguration;
516516
buildSettings = {
517517
ALWAYS_SEARCH_USER_PATHS = NO;
518-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
519518
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
520519
CLANG_CXX_LIBRARY = "libc++";
521520
CLANG_ENABLE_MODULES = YES;
@@ -530,6 +529,7 @@
530529
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
531530
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
532531
COPY_PHASE_STRIP = NO;
532+
ENABLE_TESTABILITY = YES;
533533
GCC_C_LANGUAGE_STANDARD = gnu99;
534534
GCC_DYNAMIC_NO_PIC = NO;
535535
GCC_OPTIMIZATION_LEVEL = 0;
@@ -554,7 +554,6 @@
554554
isa = XCBuildConfiguration;
555555
buildSettings = {
556556
ALWAYS_SEARCH_USER_PATHS = NO;
557-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
558557
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
559558
CLANG_CXX_LIBRARY = "libc++";
560559
CLANG_ENABLE_MODULES = YES;
@@ -591,6 +590,7 @@
591590
GCC_PRECOMPILE_PREFIX_HEADER = YES;
592591
GCC_PREFIX_HEADER = "StudyplusSDKDemo/StudyplusSDKDemo-Prefix.pch";
593592
INFOPLIST_FILE = "StudyplusSDKDemo/StudyplusSDKDemo-Info.plist";
593+
PRODUCT_BUNDLE_IDENTIFIER = "jp.studyplus.${PRODUCT_NAME:rfc1034identifier}";
594594
PRODUCT_NAME = "$(TARGET_NAME)";
595595
WRAPPER_EXTENSION = app;
596596
};
@@ -604,6 +604,7 @@
604604
GCC_PRECOMPILE_PREFIX_HEADER = YES;
605605
GCC_PREFIX_HEADER = "StudyplusSDKDemo/StudyplusSDKDemo-Prefix.pch";
606606
INFOPLIST_FILE = "StudyplusSDKDemo/StudyplusSDKDemo-Info.plist";
607+
PRODUCT_BUNDLE_IDENTIFIER = "jp.studyplus.${PRODUCT_NAME:rfc1034identifier}";
607608
PRODUCT_NAME = "$(TARGET_NAME)";
608609
WRAPPER_EXTENSION = app;
609610
};
@@ -612,7 +613,6 @@
612613
438859D018B1E90B0063BBC8 /* Debug */ = {
613614
isa = XCBuildConfiguration;
614615
buildSettings = {
615-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
616616
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/StudyplusSDKDemo.app/StudyplusSDKDemo";
617617
FRAMEWORK_SEARCH_PATHS = (
618618
"$(SDKROOT)/Developer/Library/Frameworks",
@@ -626,6 +626,7 @@
626626
"$(inherited)",
627627
);
628628
INFOPLIST_FILE = "StudyplusSDKDemoTests/StudyplusSDKDemoTests-Info.plist";
629+
PRODUCT_BUNDLE_IDENTIFIER = "jp.studyplus.${PRODUCT_NAME:rfc1034identifier}";
629630
PRODUCT_NAME = "$(TARGET_NAME)";
630631
TEST_HOST = "$(BUNDLE_LOADER)";
631632
WRAPPER_EXTENSION = xctest;
@@ -635,7 +636,6 @@
635636
438859D118B1E90B0063BBC8 /* Release */ = {
636637
isa = XCBuildConfiguration;
637638
buildSettings = {
638-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
639639
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/StudyplusSDKDemo.app/StudyplusSDKDemo";
640640
FRAMEWORK_SEARCH_PATHS = (
641641
"$(SDKROOT)/Developer/Library/Frameworks",
@@ -645,6 +645,7 @@
645645
GCC_PRECOMPILE_PREFIX_HEADER = YES;
646646
GCC_PREFIX_HEADER = "StudyplusSDKDemo/StudyplusSDKDemo-Prefix.pch";
647647
INFOPLIST_FILE = "StudyplusSDKDemoTests/StudyplusSDKDemoTests-Info.plist";
648+
PRODUCT_BUNDLE_IDENTIFIER = "jp.studyplus.${PRODUCT_NAME:rfc1034identifier}";
648649
PRODUCT_NAME = "$(TARGET_NAME)";
649650
TEST_HOST = "$(BUNDLE_LOADER)";
650651
WRAPPER_EXTENSION = xctest;

Demo/StudyplusSDKDemo/StudyplusSDKDemo/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,30 @@
55
"size" : "29x29",
66
"scale" : "2x"
77
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "29x29",
11+
"scale" : "3x"
12+
},
813
{
914
"idiom" : "iphone",
1015
"size" : "40x40",
1116
"scale" : "2x"
1217
},
18+
{
19+
"idiom" : "iphone",
20+
"size" : "40x40",
21+
"scale" : "3x"
22+
},
1323
{
1424
"idiom" : "iphone",
1525
"size" : "60x60",
1626
"scale" : "2x"
27+
},
28+
{
29+
"idiom" : "iphone",
30+
"size" : "60x60",
31+
"scale" : "3x"
1732
}
1833
],
1934
"info" : {

Demo/StudyplusSDKDemo/StudyplusSDKDemo/StudyplusSDKDemo-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>jp.studyplus.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

Demo/StudyplusSDKDemo/StudyplusSDKDemoTests/StudyplusSDKDemoTests-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>jp.studyplus.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)