Skip to content

Commit 2283cfd

Browse files
author
Roman Gomolko
committed
Merged in example-objc (pull request #1)
Example objc
2 parents d5473eb + dcf63ba commit 2283cfd

File tree

78 files changed

+1784
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1784
-68
lines changed

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@
188188
isa = PBXProject;
189189
attributes = {
190190
LastSwiftUpdateCheck = 0830;
191-
LastUpgradeCheck = 0900;
191+
LastUpgradeCheck = 1030;
192192
ORGANIZATIONNAME = UserReport;
193193
TargetAttributes = {
194194
110746E21F4492E700150955 = {
195195
CreatedOnToolsVersion = 8.3.3;
196-
LastSwiftMigration = 0900;
196+
LastSwiftMigration = 1030;
197197
ProvisioningStyle = Automatic;
198198
};
199199
110746F61F4492E700150955 = {
@@ -205,7 +205,7 @@
205205
};
206206
buildConfigurationList = 110746DE1F4492E700150955 /* Build configuration list for PBXProject "Example" */;
207207
compatibilityVersion = "Xcode 3.2";
208-
developmentRegion = English;
208+
developmentRegion = en;
209209
hasScannedForEncodings = 0;
210210
knownRegions = (
211211
en,
@@ -307,13 +307,15 @@
307307
CLANG_WARN_BOOL_CONVERSION = YES;
308308
CLANG_WARN_COMMA = YES;
309309
CLANG_WARN_CONSTANT_CONVERSION = YES;
310+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
310311
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
311312
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
312313
CLANG_WARN_EMPTY_BODY = YES;
313314
CLANG_WARN_ENUM_CONVERSION = YES;
314315
CLANG_WARN_INFINITE_RECURSION = YES;
315316
CLANG_WARN_INT_CONVERSION = YES;
316317
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
318+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
317319
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
318320
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
319321
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -364,13 +366,15 @@
364366
CLANG_WARN_BOOL_CONVERSION = YES;
365367
CLANG_WARN_COMMA = YES;
366368
CLANG_WARN_CONSTANT_CONVERSION = YES;
369+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
367370
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
368371
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
369372
CLANG_WARN_EMPTY_BODY = YES;
370373
CLANG_WARN_ENUM_CONVERSION = YES;
371374
CLANG_WARN_INFINITE_RECURSION = YES;
372375
CLANG_WARN_INT_CONVERSION = YES;
373376
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
377+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
374378
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
375379
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
376380
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -413,8 +417,7 @@
413417
PRODUCT_NAME = "$(TARGET_NAME)";
414418
PROVISIONING_PROFILE = "";
415419
PROVISIONING_PROFILE_SPECIFIER = "";
416-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
417-
SWIFT_VERSION = 4.0;
420+
SWIFT_VERSION = 5.0;
418421
};
419422
name = Debug;
420423
};
@@ -430,8 +433,7 @@
430433
PRODUCT_BUNDLE_IDENTIFIER = com.userreport.example;
431434
PRODUCT_NAME = "$(TARGET_NAME)";
432435
PROVISIONING_PROFILE_SPECIFIER = "";
433-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
434-
SWIFT_VERSION = 4.0;
436+
SWIFT_VERSION = 5.0;
435437
};
436438
name = Release;
437439
};

‎Example/Example.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/Example-Debug.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎Example/Example.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/Example.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

‎Example/Example/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1010

1111
var window: UIWindow?
1212

13-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
13+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1414

1515
// Initialize UserReport SDK
1616
let user = User()

‎Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@
103103
"scale" : "2x"
104104
},
105105
{
106-
"idiom" : "ios-marketing",
107106
"size" : "1024x1024",
107+
"idiom" : "ios-marketing",
108+
"filename" : "[email protected]",
108109
"scale" : "1x"
109110
}
110111
],

‎Example/Example/Assets.xcassets/AppIcon.appiconset/[email protected]

91.7 KB
Loading

‎Example/Example/Base.lproj/Main.storyboard

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8ss-6d-3qK">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8ss-6d-3qK">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
89
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
910
</dependencies>
1011
<scenes>
@@ -167,7 +168,7 @@
167168
<nil key="highlightedColor"/>
168169
</label>
169170
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 screens" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vu0-ch-qGQ">
170-
<rect key="frame" x="130.5" y="3.5" width="63.5" height="17"/>
171+
<rect key="frame" x="130.5" y="3" width="63.5" height="17"/>
171172
<fontDescription key="fontDescription" type="system" pointSize="14"/>
172173
<nil key="textColor"/>
173174
<nil key="highlightedColor"/>
@@ -221,7 +222,7 @@
221222
<nil key="highlightedColor"/>
222223
</label>
223224
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 screens" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zQg-Ka-34R">
224-
<rect key="frame" x="149.5" y="3.5" width="63.5" height="17"/>
225+
<rect key="frame" x="149.5" y="3" width="63.5" height="17"/>
225226
<fontDescription key="fontDescription" type="system" pointSize="14"/>
226227
<nil key="textColor"/>
227228
<nil key="highlightedColor"/>
@@ -275,7 +276,7 @@
275276
<nil key="highlightedColor"/>
276277
</label>
277278
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VJP-pc-5QQ">
278-
<rect key="frame" x="109.5" y="3.5" width="9" height="17"/>
279+
<rect key="frame" x="109.5" y="3" width="9" height="17"/>
279280
<fontDescription key="fontDescription" type="system" pointSize="14"/>
280281
<nil key="textColor"/>
281282
<nil key="highlightedColor"/>
@@ -329,7 +330,7 @@
329330
<nil key="highlightedColor"/>
330331
</label>
331332
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MKa-Tc-XOJ">
332-
<rect key="frame" x="127.5" y="3.5" width="9" height="17"/>
333+
<rect key="frame" x="127.5" y="3" width="9" height="17"/>
333334
<fontDescription key="fontDescription" type="system" pointSize="14"/>
334335
<nil key="textColor"/>
335336
<nil key="highlightedColor"/>
@@ -383,7 +384,7 @@
383384
<nil key="highlightedColor"/>
384385
</label>
385386
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="175-Y1-iBv">
386-
<rect key="frame" x="148.5" y="3.5" width="9" height="17"/>
387+
<rect key="frame" x="148.5" y="3" width="9" height="17"/>
387388
<fontDescription key="fontDescription" type="system" pointSize="14"/>
388389
<nil key="textColor"/>
389390
<nil key="highlightedColor"/>
@@ -491,10 +492,10 @@
491492
</subviews>
492493
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
493494
<constraints>
494-
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="IRW-3D-fBh" secondAttribute="bottom" id="Emu-T1-poY"/>
495+
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="IRW-3D-fBh" secondAttribute="bottom" id="6UL-Ke-LeW"/>
495496
<constraint firstItem="IRW-3D-fBh" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="20" id="GBU-Vx-PK3"/>
496497
<constraint firstAttribute="trailing" secondItem="IRW-3D-fBh" secondAttribute="trailing" constant="20" id="GRN-eD-5gw"/>
497-
<constraint firstItem="IRW-3D-fBh" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="ekU-pc-l7N"/>
498+
<constraint firstItem="IRW-3D-fBh" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="PJT-x4-ZPi"/>
498499
</constraints>
499500
</view>
500501
<navigationItem key="navigationItem" id="bXr-ET-iUF"/>

0 commit comments

Comments
 (0)