git.iko.soy/GMStepper
on master help sign in
Merge pull request #15 from lexrus/master

Upgrade to Swift 2.0 and Xcode 7 GM.

commita3f6ab14416051891cfd48025bf20091d94d0639 authorGunay Mert Karadogan <mertkaradogan@gmail.com> dateThu 10 Sep 2015, 15:46 (11 years ago) parent9bc287a0ee7bfa
7 files changed+25−9
compare with master
unifiedsplit
GMStepper/GMStepper.swift+1−1 GMStepperExample/GMStepperExample.xcodeproj/project.pbxproj+7−1 GMStepperExample/GMStepperExample/Base.lproj/LaunchScreen.xib+6−2 GMStepperExample/GMStepperExample/Base.lproj/Main.storyboard+8−2 GMStepperExample/GMStepperExample/Info.plist+1−1 GMStepperExample/GMStepperExample/ViewController.swift+1−1 GMStepperExample/GMStepperExampleTests/Info.plist+1−1
GMStepper/GMStepper.swift+1−1
@@ -233,7 +233,7 @@ import UIKit
233233 }
234234 }
235235
236− required public init(coder aDecoder: NSCoder) {
236+ required public init?(coder aDecoder: NSCoder) {
237237 super.init(coder: aDecoder)
238238 setup()
239239 }
GMStepperExample/GMStepperExample.xcodeproj/project.pbxproj+7−1
@@ -169,8 +169,9 @@
169169 319C192A1B4843EB005EFEE5 /* Project object */ = {
170170 isa = PBXProject;
171171 attributes = {
172+ LastSwiftMigration = 0700;
172173 LastSwiftUpdateCheck = 0700;
173− LastUpgradeCheck = 0640;
174+ LastUpgradeCheck = 0700;
174175 ORGANIZATIONNAME = "Gunay Mert Karadogan";
175176 TargetAttributes = {
176177 319C19311B4843EB005EFEE5 = {
@@ -292,6 +293,7 @@
292293 COPY_PHASE_STRIP = NO;
293294 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
294295 ENABLE_STRICT_OBJC_MSGSEND = YES;
296+ ENABLE_TESTABILITY = YES;
295297 GCC_C_LANGUAGE_STANDARD = gnu99;
296298 GCC_DYNAMIC_NO_PIC = NO;
297299 GCC_NO_COMMON_BLOCKS = YES;
@@ -358,6 +360,7 @@
358360 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
359361 INFOPLIST_FILE = GMStepperExample/Info.plist;
360362 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
363+ PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
361364 PRODUCT_NAME = "$(TARGET_NAME)";
362365 };
363366 name = Debug;
@@ -368,6 +371,7 @@
368371 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
369372 INFOPLIST_FILE = GMStepperExample/Info.plist;
370373 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
374+ PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
371375 PRODUCT_NAME = "$(TARGET_NAME)";
372376 };
373377 name = Release;
@@ -386,6 +390,7 @@
386390 );
387391 INFOPLIST_FILE = GMStepperExampleTests/Info.plist;
388392 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
393+ PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
389394 PRODUCT_NAME = "$(TARGET_NAME)";
390395 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GMStepperExample.app/GMStepperExample";
391396 };
@@ -401,6 +406,7 @@
401406 );
402407 INFOPLIST_FILE = GMStepperExampleTests/Info.plist;
403408 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
409+ PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
404410 PRODUCT_NAME = "$(TARGET_NAME)";
405411 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GMStepperExample.app/GMStepperExample";
406412 };
GMStepperExample/GMStepperExample/Base.lproj/LaunchScreen.xib+6−2
@@ -1,7 +1,8 @@
11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
2+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
33 <dependencies>
4− <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
4+ <deployment identifier="iOS"/>
5+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
56 <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
67 </dependencies>
78 <objects>
@@ -13,17 +14,20 @@
1314 <subviews>
1415 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Gunay Mert Karadogan. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
1516 <rect key="frame" x="20" y="439" width="441" height="21"/>
17+ <animations/>
1618 <fontDescription key="fontDescription" type="system" pointSize="17"/>
1719 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
1820 <nil key="highlightedColor"/>
1921 </label>
2022 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GMStepperExample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
2123 <rect key="frame" x="20" y="140" width="441" height="43"/>
24+ <animations/>
2225 <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
2326 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
2427 <nil key="highlightedColor"/>
2528 </label>
2629 </subviews>
30+ <animations/>
2731 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
2832 <constraints>
2933 <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
GMStepperExample/GMStepperExample/Base.lproj/Main.storyboard+8−2
@@ -1,7 +1,8 @@
11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
2+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
33 <dependencies>
4− <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
4+ <deployment identifier="iOS"/>
5+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
56 <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
67 </dependencies>
78 <scenes>
@@ -19,6 +20,7 @@
1920 <subviews>
2021 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AU6-4C-B2F" customClass="GMStepper" customModule="GMStepperExample" customModuleProvider="target">
2122 <rect key="frame" x="24" y="28" width="552" height="44"/>
23+ <animations/>
2224 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
2325 <constraints>
2426 <constraint firstAttribute="height" constant="44" id="6mC-hP-wFD"/>
@@ -34,6 +36,7 @@
3436 </view>
3537 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="if7-U5-bAM" customClass="GMStepper" customModule="GMStepperExample" customModuleProvider="target">
3638 <rect key="frame" x="140" y="116" width="320" height="66"/>
39+ <animations/>
3740 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
3841 <constraints>
3942 <constraint firstAttribute="height" constant="66" id="iQi-6P-vt9"/>
@@ -62,6 +65,7 @@
6265 </view>
6366 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R9n-I0-fq7" customClass="GMStepper" customModule="GMStepperExample" customModuleProvider="target">
6467 <rect key="frame" x="200" y="226" width="200" height="66"/>
68+ <animations/>
6569 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
6670 <constraints>
6771 <constraint firstAttribute="width" constant="200" id="dVu-w0-mf0"/>
@@ -87,6 +91,7 @@
8791 </view>
8892 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U8X-8Z-7Mo" customClass="GMStepper" customModule="GMStepperExample" customModuleProvider="target">
8993 <rect key="frame" x="24" y="336" width="552" height="44"/>
94+ <animations/>
9095 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
9196 <constraints>
9297 <constraint firstAttribute="height" constant="44" id="aF3-T7-dIP"/>
@@ -127,6 +132,7 @@
127132 </variation>
128133 </view>
129134 </subviews>
135+ <animations/>
130136 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
131137 <constraints>
132138 <constraint firstItem="R9n-I0-fq7" firstAttribute="centerX" secondItem="U8X-8Z-7Mo" secondAttribute="centerX" id="3cD-WW-Qg4"/>
GMStepperExample/GMStepperExample/Info.plist+1−1
@@ -7,7 +7,7 @@
77 <key>CFBundleExecutable</key>
88 <string>$(EXECUTABLE_NAME)</string>
99 <key>CFBundleIdentifier</key>
10− <string>com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)</string>
10+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111 <key>CFBundleInfoDictionaryVersion</key>
1212 <string>6.0</string>
1313 <key>CFBundleName</key>
GMStepperExample/GMStepperExample/ViewController.swift+1−1
@@ -17,6 +17,6 @@ class ViewController: UIViewController {
1717 }
1818
1919 func stepperValueChanged(stepper: GMStepper) {
20− print(stepper.value)
20+ print(stepper.value, terminator: "")
2121 }
2222}
GMStepperExample/GMStepperExampleTests/Info.plist+1−1
@@ -7,7 +7,7 @@
77 <key>CFBundleExecutable</key>
88 <string>$(EXECUTABLE_NAME)</string>
99 <key>CFBundleIdentifier</key>
10− <string>com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)</string>
10+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111 <key>CFBundleInfoDictionaryVersion</key>
1212 <string>6.0</string>
1313 <key>CFBundleName</key>