Skip to content

Commit

Permalink
swift 3 migration (#4)
Browse files Browse the repository at this point in the history
* swift 3 migration

* Code improvements

* Added swiftLint
  • Loading branch information
mcousillas6 authored Mar 13, 2017
1 parent 2113238 commit 50d80bb
Show file tree
Hide file tree
Showing 206 changed files with 2,471 additions and 4,455 deletions.
35 changes: 30 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Xcode
#
## OS X Finder
.DS_Store

## Build generated
build/
DerivedData

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -10,17 +15,37 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata

## Other
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.xcuserstate

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.

Carthage/
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Change Log
All notable changes to SlidingContainer will be documented in this file.

### [2.0.0](https://github.com/xmartlabs/XLSlidingContainer/releases/tag/2.0.0)

#### Swift 3 migration
* Updated the codebase to Swift3.
* Updated the readme to match new code.
* Added podspec and cartfile with new version (3.0.0)
* Added new example project.

### [1.0.0](https://github.com/xmartlabs/XLSlidingContainer/releases/tag/1.0.0)
<!-- Released on 2016-01-20. -->

* This is the initial version.

[xmartlabs]: https://xmartlabs.com
2 changes: 2 additions & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "Quick/Quick"
github "Quick/Nimble"
2 changes: 2 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "Quick/Nimble" "v6.0.1"
github "Quick/Quick" "v1.1.0"
38 changes: 38 additions & 0 deletions Example/DragView.xib
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="375" height="20"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grey_bar" translatesAutoresizingMaskIntoConstraints="NO" id="M2n-jM-Z7e">
<rect key="frame" x="160" y="5" width="55" height="10"/>
<constraints>
<constraint firstAttribute="height" constant="10" id="Da1-oC-4qH"/>
<constraint firstAttribute="width" constant="55" id="ZkD-tv-4WD"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="M2n-jM-Z7e" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="5Vt-pj-Qtl"/>
<constraint firstItem="M2n-jM-Z7e" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="dCy-Qn-fxy"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="-237" y="65"/>
</view>
</objects>
<resources>
<image name="grey_bar" width="556" height="68"/>
</resources>
</document>
Loading

0 comments on commit 50d80bb

Please sign in to comment.