Skip to content

Commit c58b737

Browse files
johnchoi96johnchoi96
authored
Merge pull request #17 from johnchoi96/1.0.1
1.0.1
2 parents 2529f38 + bd0cd40 commit c58b737

File tree

6 files changed

+48
-10
lines changed

6 files changed

+48
-10
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fastlane/test_output
9090
iOSInjectionProject/
9191

9292
# Google Firebase service info plist
93-
GoogleService-Info.plist
93+
#GoogleService-Info.plist
9494

9595
# macOS DS Store file
9696
.DS_Store

‎EmployeeManager.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
D22C7A8B2473873B00FA5DFC /* LogInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22C7A8A2473873B00FA5DFC /* LogInViewController.swift */; };
2121
D22C7A8D2473874900FA5DFC /* MainMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22C7A8C2473874900FA5DFC /* MainMenuViewController.swift */; };
2222
D22C7A8F2473894D00FA5DFC /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22C7A8E2473894D00FA5DFC /* Constants.swift */; };
23-
D22C7A932473936300FA5DFC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D22C7A922473936300FA5DFC /* GoogleService-Info.plist */; };
2423
D22C7A962473AC2F00FA5DFC /* EmployeeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22C7A952473AC2F00FA5DFC /* EmployeeTableViewController.swift */; };
24+
D2454B9924AD8F8600624B37 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D2454B9824AD8F8600624B37 /* GoogleService-Info.plist */; };
2525
D24ABC6B248C82E000016D2E /* Authentication.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D24ABC6D248C82E000016D2E /* Authentication.storyboard */; };
2626
D24ABC6E248C82E900016D2E /* MainMenu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D24ABC70248C82E900016D2E /* MainMenu.storyboard */; };
2727
D24ABC75248C834900016D2E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D24ABC77248C834900016D2E /* Localizable.strings */; };
@@ -67,8 +67,8 @@
6767
D22C7A8A2473873B00FA5DFC /* LogInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInViewController.swift; sourceTree = "<group>"; };
6868
D22C7A8C2473874900FA5DFC /* MainMenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuViewController.swift; sourceTree = "<group>"; };
6969
D22C7A8E2473894D00FA5DFC /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
70-
D22C7A922473936300FA5DFC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
7170
D22C7A952473AC2F00FA5DFC /* EmployeeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmployeeTableViewController.swift; sourceTree = "<group>"; };
71+
D2454B9824AD8F8600624B37 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
7272
D24ABC6C248C82E000016D2E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Authentication.storyboard; sourceTree = "<group>"; };
7373
D24ABC6F248C82E900016D2E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainMenu.storyboard; sourceTree = "<group>"; };
7474
D24ABC71248C831800016D2E /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Authentication.strings; sourceTree = "<group>"; };
@@ -160,8 +160,8 @@
160160
D22C7A942473A85A00FA5DFC /* Models */,
161161
D22C7A78247372FE00FA5DFC /* Assets.xcassets */,
162162
D22C7A7D247372FE00FA5DFC /* Info.plist */,
163-
D22C7A922473936300FA5DFC /* GoogleService-Info.plist */,
164163
D22C7A8E2473894D00FA5DFC /* Constants.swift */,
164+
D2454B9824AD8F8600624B37 /* GoogleService-Info.plist */,
165165
D24ABC77248C834900016D2E /* Localizable.strings */,
166166
);
167167
path = EmployeeManager;
@@ -311,8 +311,8 @@
311311
buildActionMask = 2147483647;
312312
files = (
313313
D24ABC6B248C82E000016D2E /* Authentication.storyboard in Resources */,
314+
D2454B9924AD8F8600624B37 /* GoogleService-Info.plist in Resources */,
314315
D24ABC6E248C82E900016D2E /* MainMenu.storyboard in Resources */,
315-
D22C7A932473936300FA5DFC /* GoogleService-Info.plist in Resources */,
316316
D26CE49A2479701400C1A909 /* EmployeeTableViewCell.xib in Resources */,
317317
D22C7A7C247372FE00FA5DFC /* LaunchScreen.storyboard in Resources */,
318318
D24ABC75248C834900016D2E /* Localizable.strings in Resources */,
@@ -626,14 +626,15 @@
626626
buildSettings = {
627627
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
628628
CODE_SIGN_STYLE = Automatic;
629-
CURRENT_PROJECT_VERSION = 1.0rc12;
629+
CURRENT_PROJECT_VERSION = 1001;
630630
DEVELOPMENT_TEAM = 2JDGUK4DRH;
631631
INFOPLIST_FILE = EmployeeManager/Info.plist;
632632
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
633633
LD_RUNPATH_SEARCH_PATHS = (
634634
"$(inherited)",
635635
"@executable_path/Frameworks",
636636
);
637+
MARKETING_VERSION = 1.0.1;
637638
PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.EmployeeManager;
638639
PRODUCT_NAME = Employees;
639640
SWIFT_VERSION = 5.0;
@@ -647,14 +648,15 @@
647648
buildSettings = {
648649
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
649650
CODE_SIGN_STYLE = Automatic;
650-
CURRENT_PROJECT_VERSION = 1.0rc12;
651+
CURRENT_PROJECT_VERSION = 1001;
651652
DEVELOPMENT_TEAM = 2JDGUK4DRH;
652653
INFOPLIST_FILE = EmployeeManager/Info.plist;
653654
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
654655
LD_RUNPATH_SEARCH_PATHS = (
655656
"$(inherited)",
656657
"@executable_path/Frameworks",
657658
);
659+
MARKETING_VERSION = 1.0.1;
658660
PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.EmployeeManager;
659661
PRODUCT_NAME = Employees;
660662
SWIFT_VERSION = 5.0;

‎EmployeeManager/GoogleService-Info.plist‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>554894202387-bf980vt9a0kjlmm7imb9lmb3vtmfrqga.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.554894202387-bf980vt9a0kjlmm7imb9lmb3vtmfrqga</string>
9+
<key>API_KEY</key>
10+
<string>AIzaSyC1WQ9rT0qP1QDy_T4fXoppyEqZ3UJ-AdM</string>
11+
<key>GCM_SENDER_ID</key>
12+
<string>554894202387</string>
13+
<key>PLIST_VERSION</key>
14+
<string>1</string>
15+
<key>BUNDLE_ID</key>
16+
<string>io.github.johnchoi96.EmployeeManager</string>
17+
<key>PROJECT_ID</key>
18+
<string>employeemanager-ios</string>
19+
<key>STORAGE_BUCKET</key>
20+
<string>employeemanager-ios.appspot.com</string>
21+
<key>IS_ADS_ENABLED</key>
22+
<false></false>
23+
<key>IS_ANALYTICS_ENABLED</key>
24+
<false></false>
25+
<key>IS_APPINVITE_ENABLED</key>
26+
<true></true>
27+
<key>IS_GCM_ENABLED</key>
28+
<true></true>
29+
<key>IS_SIGNIN_ENABLED</key>
30+
<true></true>
31+
<key>GOOGLE_APP_ID</key>
32+
<string>1:554894202387:ios:ab103ebe97f64066b491e6</string>
33+
<key>DATABASE_URL</key>
34+
<string>https://employeemanager-ios.firebaseio.com</string>
35+
</dict>
36+
</plist>

‎EmployeeManager/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
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>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>LSRequiresIPhoneOS</key>

‎EmployeeManager/en.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
/** AddEmployeeViewController */
120120

121121
"saving problem alert message" = "Problem occured while saving. Please try again later";
122-
"employee add confirmation message" = "New employee, \"%s\", successfully added.\n\nID: %s";
122+
"employee add confirmation message" = "New employee, \"%@\", successfully added.\n\nID: %@";
123123
"cancel confirmation alert" = "Data unsaved";
124124
"cancel confirmation alert message" = "Are you sure you want to cancel?";
125125
"go back message" = "Go Back";

‎EmployeeManager/ko.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
/** AddEmployeeViewController */
124124

125125
"saving problem alert message" = "정보를 저장 중 문제가 발생했습니다";
126-
"employee add confirmation message" = "새로운 직원, \"%s\", 님을 성공적으로 추가했습니다.\n\nID: %s";
126+
"employee add confirmation message" = "새로운 직원, \"%@\", 님을 성공적으로 추가했습니다.\n\nID: %@";
127127
"cancel confirmation alert" = "저장되지 않은 정보가 있습니다";
128128
"cancel confirmation alert message" = "정말로 닫으시겠습니까?";
129129
"go back message" = "아니오";

0 commit comments

Comments
 (0)