Skip to content

Commit 37ea31e

Browse files
kyledoldkyledold
authored
Merge pull request #17 from kyledold/1.0.5
1.0.5
2 parents 9688433 + e587167 commit 37ea31e

17 files changed

+189
-316
lines changed

‎.gitignore

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1+
2+
# Created by https://www.toptal.com/developers/gitignore/api/swift
3+
# Edit at https://www.toptal.com/developers/gitignore?templates=swift
4+
5+
### Swift ###
16
# Xcode
27
#
38
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
49

5-
## Build generated
10+
## User settings
11+
xcuserdata/
12+
13+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
14+
*.xcscmblueprint
15+
*.xccheckout
16+
17+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
618
build/
719
DerivedData/
8-
9-
## Various settings
20+
*.moved-aside
1021
*.pbxuser
1122
!default.pbxuser
1223
*.mode1v3
@@ -15,15 +26,11 @@ DerivedData/
1526
!default.mode2v3
1627
*.perspectivev3
1728
!default.perspectivev3
18-
xcuserdata/
19-
20-
## Other
21-
*.moved-aside
22-
*.xccheckout
23-
*.xcscmblueprint
2429

2530
## Obj-C/Swift specific
2631
*.hmap
32+
33+
## App packaging
2734
*.ipa
2835
*.dSYM.zip
2936
*.dSYM
@@ -33,39 +40,38 @@ timeline.xctimeline
3340
playground.xcworkspace
3441

3542
# Swift Package Manager
36-
#
3743
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
3844
# Packages/
3945
# Package.pins
4046
# Package.resolved
47+
# *.xcodeproj
48+
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
49+
# hence it is not needed unless you have added a package configuration file to your project
50+
# .swiftpm
51+
4152
.build/
4253

4354
# CocoaPods
44-
#
4555
# We recommend against adding the Pods directory to your .gitignore. However
4656
# you should judge for yourself, the pros and cons are mentioned at:
4757
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
48-
#
4958
# Pods/
50-
#
5159
# Add this line if you want to avoid checking in source code from the Xcode workspace
5260
# *.xcworkspace
5361

5462
# Carthage
55-
#
5663
# Add this line if you want to avoid checking in source code from Carthage dependencies.
5764
# Carthage/Checkouts
5865

59-
Carthage/Build
66+
Carthage/Build/
6067

6168
# Accio dependency management
6269
Dependencies/
6370
.accio/
6471

6572
# fastlane
66-
#
67-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
68-
# screenshots whenever they are needed.
73+
# It is recommended to not store the screenshots in the git repo.
74+
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
6975
# For more information about the recommended setup visit:
7076
# https://docs.fastlane.tools/best-practices/source-control/#source-control
7177

@@ -75,16 +81,17 @@ fastlane/screenshots/**/*.png
7581
fastlane/test_output
7682

7783
# Code Injection
78-
#
7984
# After new code Injection tools there's a generated folder /iOSInjectionProject
8085
# https://github.com/johnno1962/injectionforxcode
8186

8287
iOSInjectionProject/
8388

84-
NetworkKit/Source/API/Constants.swift
89+
# End of https://www.toptal.com/developers/gitignore/api/swift
8590

8691
WordOfTheDay/WordOfTheDay.xcodeproj/xcshareddata/xcschemes/WordOfTheDayWatchApp (Complication).xcscheme
8792

8893
WordOfTheDay/WordOfTheDay.xcodeproj/xcshareddata/xcschemes/WordOfTheDayWatchApp (Notification).xcscheme
8994

9095
WordOfTheDay/WordOfTheDay.xcodeproj/xcshareddata/xcschemes/WordOfTheDayWatchApp.xcscheme
96+
97+
NetworkKit/Source/API/Constants.swift

‎NetworkKit/NetworkKit.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@
605605
"@executable_path/Frameworks",
606606
"@loader_path/Frameworks",
607607
);
608-
MARKETING_VERSION = 1.0.4;
608+
MARKETING_VERSION = 1.0.5;
609609
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
610610
MTL_FAST_MATH = YES;
611611
ONLY_ACTIVE_ARCH = YES;
@@ -683,7 +683,7 @@
683683
"@executable_path/Frameworks",
684684
"@loader_path/Frameworks",
685685
);
686-
MARKETING_VERSION = 1.0.4;
686+
MARKETING_VERSION = 1.0.5;
687687
MTL_ENABLE_DEBUG_INFO = NO;
688688
MTL_FAST_MATH = YES;
689689
PRODUCT_BUNDLE_IDENTIFIER = "com.kyledold.$(PROJECT_NAME)";

‎WordOfTheDay/WordOfTheDay.xcodeproj/project.pbxproj

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
D1732AAC25B74D05009E55E8 /* SubTitleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1732AAB25B74D04009E55E8 /* SubTitleStyle.swift */; };
4343
D1732AB325B74E18009E55E8 /* ImageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1732AB225B74E18009E55E8 /* ImageExtension.swift */; };
4444
D1932D9F25D19EBD00ED1013 /* FooterStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1932D9E25D19EBD00ED1013 /* FooterStyle.swift */; };
45+
D1A13F5A26F88AB000E2681C /* LocalizedStringKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1A13F5926F88AB000E2681C /* LocalizedStringKey.swift */; };
46+
D1A3A50426F882260027A9C9 /* LocalizedStringKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1A3A50326F882260027A9C9 /* LocalizedStringKey.swift */; };
4547
D1B1350B25B0B73E00B75A8B /* WordOfTheDayApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B1350A25B0B73E00B75A8B /* WordOfTheDayApp.swift */; };
4648
D1B1350D25B0B73E00B75A8B /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B1350C25B0B73E00B75A8B /* SettingsView.swift */; };
4749
D1B1350F25B0B74300B75A8B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D1B1350E25B0B74300B75A8B /* Assets.xcassets */; };
@@ -58,6 +60,7 @@
5860
D1D5029D25B2066700F5EE51 /* WordOfTheDayViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1D5029925B2063F00F5EE51 /* WordOfTheDayViewModel.swift */; };
5961
D1D502AA25B3502100F5EE51 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D1D502A925B3502100F5EE51 /* Localizable.strings */; };
6062
D1FB55EA25F0CDE500F87AC4 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D1FB55E925F0CDE500F87AC4 /* AVFoundation.framework */; };
63+
D1FB560C25F25A9E00F87AC4 /* DateFormatterExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1FB560225F2592300F87AC4 /* DateFormatterExtension.swift */; };
6164
/* End PBXBuildFile section */
6265

6366
/* Begin PBXContainerItemProxy section */
@@ -178,6 +181,8 @@
178181
D1732AAB25B74D04009E55E8 /* SubTitleStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubTitleStyle.swift; sourceTree = "<group>"; };
179182
D1732AB225B74E18009E55E8 /* ImageExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageExtension.swift; sourceTree = "<group>"; };
180183
D1932D9E25D19EBD00ED1013 /* FooterStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterStyle.swift; sourceTree = "<group>"; };
184+
D1A13F5926F88AB000E2681C /* LocalizedStringKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedStringKey.swift; sourceTree = "<group>"; };
185+
D1A3A50326F882260027A9C9 /* LocalizedStringKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedStringKey.swift; sourceTree = "<group>"; };
181186
D1B1350725B0B73E00B75A8B /* WordOfTheDay.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WordOfTheDay.app; sourceTree = BUILT_PRODUCTS_DIR; };
182187
D1B1350A25B0B73E00B75A8B /* WordOfTheDayApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordOfTheDayApp.swift; sourceTree = "<group>"; };
183188
D1B1350C25B0B73E00B75A8B /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
@@ -197,6 +202,7 @@
197202
D1D5029925B2063F00F5EE51 /* WordOfTheDayViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordOfTheDayViewModel.swift; sourceTree = "<group>"; };
198203
D1D502A925B3502100F5EE51 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
199204
D1FB55E925F0CDE500F87AC4 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
205+
D1FB560225F2592300F87AC4 /* DateFormatterExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateFormatterExtension.swift; sourceTree = "<group>"; };
200206
/* End PBXFileReference section */
201207

202208
/* Begin PBXFrameworksBuildPhase section */
@@ -432,6 +438,7 @@
432438
children = (
433439
D1B1351D25B0B86900B75A8B /* BundleExtension.swift */,
434440
D1732AB225B74E18009E55E8 /* ImageExtension.swift */,
441+
D1A3A50326F882260027A9C9 /* LocalizedStringKey.swift */,
435442
);
436443
path = Extensions;
437444
sourceTree = "<group>";
@@ -465,6 +472,7 @@
465472
D1D5027D25B2056400F5EE51 /* WordOfTheDayWidgetProvider.swift */,
466473
D1D5029925B2063F00F5EE51 /* WordOfTheDayViewModel.swift */,
467474
D1D5028725B205B000F5EE51 /* WordOfTheDayEntryView.swift */,
475+
D1FB55FF25F2590800F87AC4 /* Extensions */,
468476
D102301525B6004200C1AD0C /* Modifiers */,
469477
);
470478
path = Source;
@@ -481,6 +489,15 @@
481489
path = Resources;
482490
sourceTree = "<group>";
483491
};
492+
D1FB55FF25F2590800F87AC4 /* Extensions */ = {
493+
isa = PBXGroup;
494+
children = (
495+
D1FB560225F2592300F87AC4 /* DateFormatterExtension.swift */,
496+
D1A13F5926F88AB000E2681C /* LocalizedStringKey.swift */,
497+
);
498+
path = Extensions;
499+
sourceTree = "<group>";
500+
};
484501
/* End PBXGroup section */
485502

486503
/* Begin PBXNativeTarget section */
@@ -676,6 +693,7 @@
676693
D1732AB325B74E18009E55E8 /* ImageExtension.swift in Sources */,
677694
D138C94225CC062600E67FF6 /* BodyStyle.swift in Sources */,
678695
D1B1350D25B0B73E00B75A8B /* SettingsView.swift in Sources */,
696+
D1A3A50426F882260027A9C9 /* LocalizedStringKey.swift in Sources */,
679697
D1B1350B25B0B73E00B75A8B /* WordOfTheDayApp.swift in Sources */,
680698
D1732AAC25B74D05009E55E8 /* SubTitleStyle.swift in Sources */,
681699
D1732A9925B747C1009E55E8 /* SettingsViewModel.swift in Sources */,
@@ -690,7 +708,9 @@
690708
files = (
691709
D1D5029225B2061A00F5EE51 /* WordOfTheDayWidgetProvider.swift in Sources */,
692710
D102304B25B603D800C1AD0C /* SubTitleStyle.swift in Sources */,
711+
D1FB560C25F25A9E00F87AC4 /* DateFormatterExtension.swift in Sources */,
693712
D168483725CB13E5002BDC3F /* WordOfTheDayWidget.intentdefinition in Sources */,
713+
D1A13F5A26F88AB000E2681C /* LocalizedStringKey.swift in Sources */,
694714
D1D5026E25B2051F00F5EE51 /* WordOfTheDayWidget.swift in Sources */,
695715
D1D5028D25B2061700F5EE51 /* WordOfTheDayEntryView.swift in Sources */,
696716
D102304F25B603DD00C1AD0C /* BodyStyle.swift in Sources */,
@@ -747,7 +767,7 @@
747767
"@executable_path/Frameworks",
748768
"@executable_path/../../Frameworks",
749769
);
750-
MARKETING_VERSION = 1.0.4;
770+
MARKETING_VERSION = 1.0.5;
751771
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.watchkitapp.watchkitextension;
752772
PRODUCT_NAME = "${TARGET_NAME}";
753773
SDKROOT = watchos;
@@ -773,7 +793,7 @@
773793
"@executable_path/Frameworks",
774794
"@executable_path/../../Frameworks",
775795
);
776-
MARKETING_VERSION = 1.0.4;
796+
MARKETING_VERSION = 1.0.5;
777797
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.watchkitapp.watchkitextension;
778798
PRODUCT_NAME = "${TARGET_NAME}";
779799
SDKROOT = watchos;
@@ -795,7 +815,7 @@
795815
DEVELOPMENT_TEAM = NPHFRGDN5J;
796816
IBSC_MODULE = WordOfTheDayWatchApp_Extension;
797817
INFOPLIST_FILE = WordOfTheDayWatchApp/Resources/Info.plist;
798-
MARKETING_VERSION = 1.0.4;
818+
MARKETING_VERSION = 1.0.5;
799819
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.watchkitapp;
800820
PRODUCT_NAME = "$(TARGET_NAME)";
801821
SDKROOT = watchos;
@@ -817,7 +837,7 @@
817837
DEVELOPMENT_TEAM = NPHFRGDN5J;
818838
IBSC_MODULE = WordOfTheDayWatchApp_Extension;
819839
INFOPLIST_FILE = WordOfTheDayWatchApp/Resources/Info.plist;
820-
MARKETING_VERSION = 1.0.4;
840+
MARKETING_VERSION = 1.0.5;
821841
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.watchkitapp;
822842
PRODUCT_NAME = "$(TARGET_NAME)";
823843
SDKROOT = watchos;
@@ -961,7 +981,7 @@
961981
"$(inherited)",
962982
"@executable_path/Frameworks",
963983
);
964-
MARKETING_VERSION = 1.0.4;
984+
MARKETING_VERSION = 1.0.5;
965985
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay;
966986
PRODUCT_NAME = "$(TARGET_NAME)";
967987
SWIFT_VERSION = 5.0;
@@ -986,7 +1006,7 @@
9861006
"$(inherited)",
9871007
"@executable_path/Frameworks",
9881008
);
989-
MARKETING_VERSION = 1.0.4;
1009+
MARKETING_VERSION = 1.0.5;
9901010
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay;
9911011
PRODUCT_NAME = "$(TARGET_NAME)";
9921012
SWIFT_VERSION = 5.0;
@@ -1009,7 +1029,7 @@
10091029
"@executable_path/Frameworks",
10101030
"@executable_path/../../Frameworks",
10111031
);
1012-
MARKETING_VERSION = 1.0.4;
1032+
MARKETING_VERSION = 1.0.5;
10131033
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.WordOfTheDayWidget;
10141034
PRODUCT_NAME = "$(TARGET_NAME)";
10151035
SKIP_INSTALL = YES;
@@ -1033,7 +1053,7 @@
10331053
"@executable_path/Frameworks",
10341054
"@executable_path/../../Frameworks",
10351055
);
1036-
MARKETING_VERSION = 1.0.4;
1056+
MARKETING_VERSION = 1.0.5;
10371057
PRODUCT_BUNDLE_IDENTIFIER = com.kyledold.WordOfTheDay.WordOfTheDayWidget;
10381058
PRODUCT_NAME = "$(TARGET_NAME)";
10391059
SKIP_INSTALL = YES;

‎WordOfTheDay/WordOfTheDay.xcodeproj/xcshareddata/xcschemes/WordOfTheDayWatchApp (Complication).xcscheme

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)