Skip to content

Commit b6db8c4

Browse files
mltbnzmltbnz
authored
Release/4.0.0 (#438)
1 parent a5f4cff commit b6db8c4

35 files changed

+533
-158
lines changed

‎App/iOS App/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "1.000",
9+
"green" : "1.000",
10+
"red" : "1.000"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "1.000",
27+
"green" : "1.000",
28+
"red" : "1.000"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎App/iOS App/Info.plist

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,13 @@
107107
<array>
108108
<string>armv7</string>
109109
</array>
110+
<key>UIRequiresFullScreen</key>
111+
<true/>
110112
<key>UISupportedInterfaceOrientations</key>
111113
<array>
112114
<string>UIInterfaceOrientationPortrait</string>
113115
<string>UIInterfaceOrientationLandscapeLeft</string>
114116
<string>UIInterfaceOrientationLandscapeRight</string>
115117
</array>
116-
<key>UISupportedInterfaceOrientations~ipad</key>
117-
<array>
118-
<string>UIInterfaceOrientationPortrait</string>
119-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
120-
<string>UIInterfaceOrientationLandscapeLeft</string>
121-
<string>UIInterfaceOrientationLandscapeRight</string>
122-
</array>
123-
<key>CFBundleLocalizations</key>
124-
<array>
125-
<string>de</string>
126-
<string>en</string>
127-
<string>es</string>
128-
<string>fr</string>
129-
<string>it</string>
130-
</array>
131118
</dict>
132119
</plist>

‎App/iOS App/Launch Screen.storyboard

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3-
<device id="retina4_7" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina4_7" orientation="portrait" appearance="light"/>
64
<dependencies>
7-
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
96
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
107
</dependencies>
118
<scenes>
@@ -26,8 +23,8 @@
2623
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2724
<color key="backgroundColor" red="1" green="0.83999999999999997" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
2825
</imageView>
29-
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Logo" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gPi-RF-tRv">
30-
<rect key="frame" x="27" y="96" width="320" height="160"/>
26+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gPi-RF-tRv">
27+
<rect key="frame" x="27.5" y="170" width="320" height="160"/>
3128
<constraints>
3229
<constraint firstAttribute="width" constant="320" id="TUM-SN-1pH"/>
3330
<constraint firstAttribute="height" constant="160" id="eoh-7W-ESf"/>

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Changelog for Critical Maps iOS
44

5-
# Unreleased
5+
# [4.0.0] - 2022-03-18
66

77
__Proposal for the release is to make it `4.0.0`__
88
This release is a rebuild of the app built with [`The Composable Architecture`](https://github.com/pointfreeco/swift-composable-architecture) and `SwiftUI`

‎CriticalMaps.xcodeproj/project.pbxproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
731CFCC9267A745600F1093B /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = 731CFCC8267A745600F1093B /* AppFeature */; };
10+
731CFCC9267A745600F1093B /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = 731CFCC8267A745600F1093B /* AppFeature */; settings = {ATTRIBUTES = (Required, ); }; };
1111
73238EBD27728043003DE01F /* ChatFeaturePreviewApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73238EBC27728043003DE01F /* ChatFeaturePreviewApp.swift */; };
1212
73238EC927728081003DE01F /* ChatFeature in Frameworks */ = {isa = PBXBuildFile; productRef = 73238EC827728081003DE01F /* ChatFeature */; };
1313
73238ED12773289F003DE01F /* SettingsFeaturePreviewApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73238ED02773289F003DE01F /* SettingsFeaturePreviewApp.swift */; };
@@ -304,7 +304,7 @@
304304
isa = PBXProject;
305305
attributes = {
306306
LastSwiftUpdateCheck = 1320;
307-
LastUpgradeCheck = 1250;
307+
LastUpgradeCheck = 1330;
308308
TargetAttributes = {
309309
73238EB927728043003DE01F = {
310310
CreatedOnToolsVersion = 13.2;
@@ -652,6 +652,7 @@
652652
isa = XCBuildConfiguration;
653653
buildSettings = {
654654
ALWAYS_SEARCH_USER_PATHS = NO;
655+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
655656
CLANG_ANALYZER_NONNULL = YES;
656657
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
657658
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -713,6 +714,7 @@
713714
isa = XCBuildConfiguration;
714715
buildSettings = {
715716
ALWAYS_SEARCH_USER_PATHS = NO;
717+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
716718
CLANG_ANALYZER_NONNULL = YES;
717719
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
718720
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -771,7 +773,7 @@
771773
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
772774
CODE_SIGN_IDENTITY = "iPhone Distribution";
773775
CODE_SIGN_STYLE = Manual;
774-
CURRENT_PROJECT_VERSION = 1;
776+
CURRENT_PROJECT_VERSION = 6;
775777
DEVELOPMENT_TEAM = 5YLLXUZBZ2;
776778
ENABLE_PREVIEWS = YES;
777779
INFOPLIST_FILE = "$(SRCROOT)/App/iOS App/Info.plist";
@@ -786,7 +788,7 @@
786788
PROVISIONING_PROFILE_SPECIFIER = "Critical Maps Prov Profile";
787789
RUN_DOCUMENTATION_COMPILER = YES;
788790
SWIFT_VERSION = 5.0;
789-
TARGETED_DEVICE_FAMILY = 1;
791+
TARGETED_DEVICE_FAMILY = "1,2";
790792
};
791793
name = Debug;
792794
};
@@ -797,7 +799,7 @@
797799
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
798800
CODE_SIGN_IDENTITY = "iPhone Distribution";
799801
CODE_SIGN_STYLE = Manual;
800-
CURRENT_PROJECT_VERSION = 1;
802+
CURRENT_PROJECT_VERSION = 6;
801803
DEVELOPMENT_TEAM = 5YLLXUZBZ2;
802804
ENABLE_PREVIEWS = YES;
803805
INFOPLIST_FILE = "$(SRCROOT)/App/iOS App/Info.plist";
@@ -811,8 +813,9 @@
811813
PRODUCT_NAME = "$(TARGET_NAME)";
812814
PROVISIONING_PROFILE_SPECIFIER = "Critical Maps Prov Profile";
813815
RUN_DOCUMENTATION_COMPILER = YES;
816+
SKIP_INSTALL = NO;
814817
SWIFT_VERSION = 5.0;
815-
TARGETED_DEVICE_FAMILY = 1;
818+
TARGETED_DEVICE_FAMILY = "1,2";
816819
};
817820
name = Release;
818821
};

‎CriticalMaps.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CriticalMaps.xcodeproj/xcshareddata/xcschemes/ChatFeaturePreviewApp.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 = "1320"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMaps.xcodeproj/xcshareddata/xcschemes/Critical Maps.xcscheme

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
4-
version = "1.7">
3+
LastUpgradeVersion = "1330"
4+
version = "2.1">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -20,6 +20,16 @@
2020
ReferencedContainer = "container:CriticalMaps.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "NO">
29+
<TestPlanReference
30+
reference = "container:App/ModulesTests.xctestplan">
31+
</TestPlanReference>
32+
</BuildActionEntry>
2333
</BuildActionEntries>
2434
</BuildAction>
2535
<TestAction
@@ -33,53 +43,13 @@
3343
default = "YES">
3444
</TestPlanReference>
3545
</TestPlans>
36-
<Testables>
37-
<TestableReference
38-
skipped = "NO">
39-
<BuildableReference
40-
BuildableIdentifier = "primary"
41-
BlueprintIdentifier = "CriticalMapsKitTests"
42-
BuildableName = "CriticalMapsKitTests"
43-
BlueprintName = "CriticalMapsKitTests"
44-
ReferencedContainer = "container:../CriticalMapsKit">
45-
</BuildableReference>
46-
</TestableReference>
47-
<TestableReference
48-
skipped = "NO">
49-
<BuildableReference
50-
BuildableIdentifier = "primary"
51-
BlueprintIdentifier = "MapFeatureTests"
52-
BuildableName = "MapFeatureTests"
53-
BlueprintName = "MapFeatureTests"
54-
ReferencedContainer = "container:../CriticalMapsKit">
55-
</BuildableReference>
56-
</TestableReference>
57-
<TestableReference
58-
skipped = "NO">
59-
<BuildableReference
60-
BuildableIdentifier = "primary"
61-
BlueprintIdentifier = "AppFeatureTests"
62-
BuildableName = "AppFeatureTests"
63-
BlueprintName = "AppFeatureTests"
64-
ReferencedContainer = "container:../CriticalMapsKit">
65-
</BuildableReference>
66-
</TestableReference>
67-
<TestableReference
68-
skipped = "NO">
69-
<BuildableReference
70-
BuildableIdentifier = "primary"
71-
BlueprintIdentifier = "IDProviderTests"
72-
BuildableName = "IDProviderTests"
73-
BlueprintName = "IDProviderTests"
74-
ReferencedContainer = "container:../CriticalMapsKit">
75-
</BuildableReference>
76-
</TestableReference>
77-
</Testables>
7846
</TestAction>
7947
<LaunchAction
8048
buildConfiguration = "Debug"
8149
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8250
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
51+
enableThreadSanitizer = "YES"
52+
language = "de"
8353
launchStyle = "0"
8454
useCustomWorkingDirectory = "NO"
8555
ignoresPersistentStateOnLaunch = "NO"

‎CriticalMaps.xcodeproj/xcshareddata/xcschemes/SettingsFeaturePreview.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 = "1320"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMaps.xcodeproj/xcshareddata/xcschemes/TwitterFeaturePreview.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 = "1320"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/ApiClient.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 = "1300"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/AppFeature.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 = "1300"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/CriticalMapsKit.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 = "1250"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/HelperTests.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 = "1320"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/MapFeature.xcscheme

Lines changed: 11 additions & 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 = "1300"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -28,6 +28,16 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "MapFeatureTests"
36+
BuildableName = "MapFeatureTests"
37+
BlueprintName = "MapFeatureTests"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</TestableReference>
3141
</Testables>
3242
</TestAction>
3343
<LaunchAction

‎CriticalMapsKit/.swiftpm/xcode/xcshareddata/xcschemes/MapFeatureTests.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 = "1250"
3+
LastUpgradeVersion = "1330"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CriticalMapsKit/Sources/Helpers/Date+Additions.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Foundation
22

3-
public extension Date {
4-
static var now: Date { Date() }
5-
3+
public extension Date {
64
/// Get a component representation of todays Date as Int.
75
/// - Parameter keyPath:
86
/// - Returns: DateComponent representation as Int. Returns 0 when component is not available

0 commit comments

Comments
 (0)