Skip to content

Commit 7455823

Browse files
committed
Merge branch 'release/1.4.1'
2 parents cd950f4 + 1a09f98 commit 7455823

24 files changed

+42
-40
lines changed

Song Rating.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@
422422
isa = PBXProject;
423423
attributes = {
424424
LastSwiftUpdateCheck = 1110;
425-
LastUpgradeCheck = 1150;
425+
LastUpgradeCheck = 1230;
426426
ORGANIZATIONNAME = "Cirno MainasuK";
427427
TargetAttributes = {
428428
DB106C4122C53D4B00502D7C = {
@@ -675,6 +675,7 @@
675675
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
676676
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
677677
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
678+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
678679
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
679680
CLANG_WARN_STRICT_PROTOTYPES = YES;
680681
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -737,6 +738,7 @@
737738
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
738739
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
739740
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
741+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
740742
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
741743
CLANG_WARN_STRICT_PROTOTYPES = YES;
742744
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -776,15 +778,15 @@
776778
CODE_SIGN_IDENTITY = "Apple Development";
777779
CODE_SIGN_STYLE = Automatic;
778780
COMBINE_HIDPI_IMAGES = YES;
779-
CURRENT_PROJECT_VERSION = 13;
781+
CURRENT_PROJECT_VERSION = 14;
780782
DEVELOPMENT_TEAM = A8K92XFF77;
781783
ENABLE_HARDENED_RUNTIME = YES;
782784
INFOPLIST_FILE = "Song Rating/Info.plist";
783785
LD_RUNPATH_SEARCH_PATHS = (
784786
"$(inherited)",
785787
"@executable_path/../Frameworks",
786788
);
787-
MARKETING_VERSION = 1.4.0;
789+
MARKETING_VERSION = 1.4.1;
788790
PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
789791
PRODUCT_NAME = "$(TARGET_NAME)";
790792
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -804,15 +806,15 @@
804806
CODE_SIGN_IDENTITY = "Apple Development";
805807
CODE_SIGN_STYLE = Automatic;
806808
COMBINE_HIDPI_IMAGES = YES;
807-
CURRENT_PROJECT_VERSION = 13;
809+
CURRENT_PROJECT_VERSION = 14;
808810
DEVELOPMENT_TEAM = A8K92XFF77;
809811
ENABLE_HARDENED_RUNTIME = YES;
810812
INFOPLIST_FILE = "Song Rating/Info.plist";
811813
LD_RUNPATH_SEARCH_PATHS = (
812814
"$(inherited)",
813815
"@executable_path/../Frameworks",
814816
);
815-
MARKETING_VERSION = 1.4.0;
817+
MARKETING_VERSION = 1.4.1;
816818
PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
817819
PRODUCT_NAME = "$(TARGET_NAME)";
818820
PROVISIONING_PROFILE_SPECIFIER = "";

Song Rating.xcodeproj/xcshareddata/xcschemes/Song Rating - Debug Memory.xcscheme

Lines changed: 1 addition & 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 = "1170"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Song Rating.xcodeproj/xcshareddata/xcschemes/Song Rating.xcscheme

Lines changed: 1 addition & 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 = "1170"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
22
"images" : [
33
{
4-
"size" : "16x16",
4+
"filename" : "icon_16x16.png",
55
"idiom" : "mac",
6-
"filename" : "Icon Artwork Small16@1x.png",
7-
"scale" : "1x"
6+
"scale" : "1x",
7+
"size" : "16x16"
88
},
99
{
10-
"size" : "16x16",
10+
"filename" : "icon_16x16@2x.png",
1111
"idiom" : "mac",
12-
"filename" : "Icon Artwork Small16@2x.png",
13-
"scale" : "2x"
12+
"scale" : "2x",
13+
"size" : "16x16"
1414
},
1515
{
16-
"size" : "32x32",
16+
"filename" : "icon_32x32.png",
1717
"idiom" : "mac",
18-
"filename" : "Icon Artwork Small32@1x.png",
19-
"scale" : "1x"
18+
"scale" : "1x",
19+
"size" : "32x32"
2020
},
2121
{
22-
"size" : "32x32",
22+
"filename" : "icon_32x32@2x.png",
2323
"idiom" : "mac",
24-
"filename" : "Icon Artwork Small32@2x.png",
25-
"scale" : "2x"
24+
"scale" : "2x",
25+
"size" : "32x32"
2626
},
2727
{
28-
"size" : "128x128",
28+
"filename" : "icon_128x128.png",
2929
"idiom" : "mac",
30-
"filename" : "Icon Artwork Small128@1x.png",
31-
"scale" : "1x"
30+
"scale" : "1x",
31+
"size" : "128x128"
3232
},
3333
{
34-
"size" : "128x128",
34+
"filename" : "icon_128x128@2x.png",
3535
"idiom" : "mac",
36-
"filename" : "Icon Artwork Small128@2x.png",
37-
"scale" : "2x"
36+
"scale" : "2x",
37+
"size" : "128x128"
3838
},
3939
{
40-
"size" : "256x256",
40+
"filename" : "icon_256x256.png",
4141
"idiom" : "mac",
42-
"filename" : "Icon Artwork Small128@2x-1.png",
43-
"scale" : "1x"
42+
"scale" : "1x",
43+
"size" : "256x256"
4444
},
4545
{
46-
"size" : "256x256",
46+
"filename" : "icon_256x256@2x.png",
4747
"idiom" : "mac",
48-
"filename" : "Icon Artwork256@2x.png",
49-
"scale" : "2x"
48+
"scale" : "2x",
49+
"size" : "256x256"
5050
},
5151
{
52-
"size" : "512x512",
52+
"filename" : "icon_512x512.png",
5353
"idiom" : "mac",
54-
"filename" : "Icon Artwork512@1x.png",
55-
"scale" : "1x"
54+
"scale" : "1x",
55+
"size" : "512x512"
5656
},
5757
{
58-
"size" : "512x512",
58+
"filename" : "icon_512x512@2x.png",
5959
"idiom" : "mac",
60-
"filename" : "Icon Artwork512@2x.png",
61-
"scale" : "2x"
60+
"scale" : "2x",
61+
"size" : "512x512"
6262
}
6363
],
6464
"info" : {
65-
"version" : 1,
66-
"author" : "xcode"
65+
"author" : "xcode",
66+
"version" : 1
6767
}
68-
}
68+
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)