Skip to content

Commit c13ff81

Browse files
funzinfunzin
authored
Merge pull request #37 from funzin/v2.0.0
v2.0.0
2 parents 122a409 + 4dce0d2 commit c13ff81

24 files changed

+67
-51
lines changed

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
22
"images" : [
33
{
4+
"filename" : "[email protected]",
45
"idiom" : "iphone",
5-
"size" : "20x20",
66
"scale" : "2x",
7-
"filename" : "[email protected]"
7+
"size" : "20x20"
88
},
99
{
10+
"filename" : "[email protected]",
1011
"idiom" : "iphone",
11-
"size" : "20x20",
1212
"scale" : "3x",
13-
"filename" : "[email protected]"
13+
"size" : "20x20"
1414
},
1515
{
16+
"filename" : "[email protected]",
1617
"idiom" : "iphone",
17-
"size" : "29x29",
1818
"scale" : "2x",
19-
"filename" : "[email protected]"
19+
"size" : "29x29"
2020
},
2121
{
22+
"filename" : "[email protected]",
2223
"idiom" : "iphone",
23-
"size" : "29x29",
2424
"scale" : "3x",
25-
"filename" : "[email protected]"
25+
"size" : "29x29"
2626
},
2727
{
28+
"filename" : "[email protected]",
2829
"idiom" : "iphone",
29-
"size" : "40x40",
3030
"scale" : "2x",
31-
"filename" : "[email protected]"
31+
"size" : "40x40"
3232
},
3333
{
34+
"filename" : "[email protected]",
3435
"idiom" : "iphone",
35-
"size" : "40x40",
3636
"scale" : "3x",
37-
"filename" : "[email protected]"
37+
"size" : "40x40"
3838
},
3939
{
40+
"filename" : "[email protected]",
4041
"idiom" : "iphone",
41-
"size" : "60x60",
4242
"scale" : "2x",
43-
"filename" : "[email protected]"
43+
"size" : "60x60"
4444
},
4545
{
46+
"filename" : "[email protected]",
4647
"idiom" : "iphone",
47-
"size" : "60x60",
4848
"scale" : "3x",
49-
"filename" : "[email protected]"
49+
"size" : "60x60"
5050
},
5151
{
52+
"filename" : "[email protected]",
5253
"idiom" : "ipad",
53-
"size" : "20x20",
5454
"scale" : "1x",
55-
"filename" : "[email protected]"
55+
"size" : "20x20"
5656
},
5757
{
58+
"filename" : "[email protected]",
5859
"idiom" : "ipad",
59-
"size" : "20x20",
6060
"scale" : "2x",
61-
"filename" : "[email protected]"
61+
"size" : "20x20"
6262
},
6363
{
64+
"filename" : "[email protected]",
6465
"idiom" : "ipad",
65-
"size" : "29x29",
6666
"scale" : "1x",
67-
"filename" : "[email protected]"
67+
"size" : "29x29"
6868
},
6969
{
70+
"filename" : "[email protected]",
7071
"idiom" : "ipad",
71-
"size" : "29x29",
7272
"scale" : "2x",
73-
"filename" : "[email protected]"
73+
"size" : "29x29"
7474
},
7575
{
76+
"filename" : "[email protected]",
7677
"idiom" : "ipad",
77-
"size" : "40x40",
7878
"scale" : "1x",
79-
"filename" : "[email protected]"
79+
"size" : "40x40"
8080
},
8181
{
82+
"filename" : "[email protected]",
8283
"idiom" : "ipad",
83-
"size" : "40x40",
8484
"scale" : "2x",
85-
"filename" : "[email protected]"
85+
"size" : "40x40"
8686
},
8787
{
88+
"filename" : "[email protected]",
8889
"idiom" : "ipad",
89-
"size" : "76x76",
9090
"scale" : "1x",
91-
"filename" : "[email protected]"
91+
"size" : "76x76"
9292
},
9393
{
94+
"filename" : "[email protected]",
9495
"idiom" : "ipad",
95-
"size" : "76x76",
9696
"scale" : "2x",
97-
"filename" : "[email protected]"
97+
"size" : "76x76"
9898
},
9999
{
100+
"filename" : "[email protected]",
100101
"idiom" : "ipad",
101-
"size" : "83.5x83.5",
102102
"scale" : "2x",
103-
"filename" : "[email protected]"
103+
"size" : "83.5x83.5"
104104
},
105105
{
106+
"filename" : "[email protected]",
106107
"idiom" : "ios-marketing",
107-
"size" : "1024x1024",
108108
"scale" : "1x",
109-
"filename" : "[email protected]"
109+
"size" : "1024x1024"
110110
}
111111
],
112112
"info" : {
113-
"version" : 1,
114-
"author" : "xcode"
113+
"author" : "xcode",
114+
"version" : 1
115115
}
116-
}
116+
}

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

-10.5 KB
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

-51 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

139 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

251 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

74 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

153 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

315 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

139 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

310 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

701 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

701 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

1.07 KB
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

273 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

1.09 KB
Loading

‎LongWeekend/Resource/Assets.xcassets/AppIcon.appiconset/[email protected]

945 Bytes
Loading

‎LongWeekend/Resource/Assets.xcassets/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info" : {
3-
"version" : 1,
4-
"author" : "xcode"
3+
"author" : "xcode",
4+
"version" : 1
55
}
6-
}
6+
}

‎LongWeekend/Resource/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
20-
<string>7</string>
20+
<string>2</string>
2121
<key>GADApplicationIdentifier</key>
2222
<string>ca-app-pub-3940256099942544~1458002511</string>
2323
<key>GADIsAdManagerApp</key>

‎LongWeekend/Resource/Localizable/ja.lproj/InfoPlist.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
*/
88

9-
"CFBundleDisplayName" = "休日";
9+
"CFBundleDisplayName" = "連休チェッカー";

‎LongWeekend/Resource/Settings.bundle/com.funzin.longweekend.latest_result.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ name: grpc-SwiftPM, nameSpecified: gRPC, owner: firebase, version: 1.28.4
4444

4545
name: gtm-session-fetcher, nameSpecified: GTMSessionFetcher, owner: google, version: 1.5.0
4646

47-
name: holiday_jp-swift, nameSpecified: HolidayJp, owner: holiday-jp, version: 0.2.1
47+
name: holiday_jp-swift, nameSpecified: HolidayJp, owner: funzin, version:
4848

4949
name: leveldb, nameSpecified: leveldb, owner: firebase, version: 1.22.2
5050

‎LongWeekendTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>1</string>
20+
<string>2</string>
2121
</dict>
2222
</plist>

‎Podfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ target 'LongWeekend' do
2020
end
2121

2222
end
23+
24+
post_install do |installer|
25+
installer.pods_project.build_configurations.each do |config|
26+
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
27+
end
28+
end
29+

‎Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ SPEC CHECKSUMS:
6767
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
6868
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
6969

70-
PODFILE CHECKSUM: bc1b3eccfdc28eb39fb8747622ba5e526fda0755
70+
PODFILE CHECKSUM: 7009013e8164cac21ecb439b4e6cac846f133a56
7171

7272
COCOAPODS: 1.10.1

‎project.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ packages:
1010
url: https://github.com/sunshinejr/SwiftyUserDefaults
1111
version: 5.3.0
1212
HolidayJp:
13-
url: https://github.com/holiday-jp/holiday_jp-swift
14-
version: 0.2.1
13+
url: https://github.com/funzin/holiday_jp-swift
14+
branch: remove-unused-date
1515
Firebase:
1616
url: https://github.com/firebase/firebase-ios-sdk
1717
version: 8.0.0
@@ -29,8 +29,14 @@ targets:
2929
product: FirebaseAnalytics
3030
settings:
3131
base:
32+
PRODUCT_BUNDLE_IDENTIFIER: com.funzin.longweekend
33+
MARKETING_VERSION: 2.0.0
34+
EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
35+
CURRENT_PROJECT_VERSION: 1
36+
VERSIONING_SYSTEM: apple-generic
3237
INFOPLIST_FILE: LongWeekend/Resource/Info.plist
3338
CODE_SIGN_STYLE: Manual
39+
INFOPLIST_PREPROCESS: YES
3440
prebuildScripts:
3541
- name: Run swiftformat
3642
script: make swiftformat
@@ -48,7 +54,10 @@ targets:
4854
envPath="${SRCROOT}/.env"
4955
if [ -e $envPath ]; then
5056
. $envPath
51-
$plistBuddy -c "Set :GADApplicationIdentifier ${GAD_APPLICATION_ID}" ${infoPlistFileDestination}
57+
identifier=${GAD_APPLICATION_ID}
58+
echo ${infoPlistFileDestination}
59+
echo ${identifier}
60+
$plistBuddy -c "Set :GADApplicationIdentifier ${identifier}" ${infoPlistFileDestination}
5261
fi
5362
postbuildScripts:
5463
- name: Run SwiftLint

0 commit comments

Comments
 (0)