diff --git a/.gitignore b/.gitignore index f856ec7..e73df90 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ Carthage Relayout.framework.zip build - +.build diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..c043eea --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +2.2.1 diff --git a/.travis.yml b/.travis.yml index 7e867e8..c585ce1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,14 @@ osx_image: xcode7.3 xcode_project: Relayout.xcodeproj xcode_sdk: iphonesimulator9.3 -env: - global: - - FRAMEWORK_NAME=Relayout - before_install: - brew update - brew outdated carthage || brew upgrade carthage - gem install xcpretty --no-rdoc --no-ri --no-document --quiet +install: +- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" + script: - xctool clean build -project Relayout.xcodeproj -scheme "Relayout" -sdk iphonesimulator - xctool test -project Relayout.xcodeproj -scheme "Relayout" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 5s" @@ -22,6 +21,7 @@ script: - xctool clean build -project Relayout.xcodeproj -scheme "Sample App" -sdk iphonesimulator - carthage build --no-skip-current - pod lib lint +- swift build before_deploy: - carthage archive Relayout diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..2c85ac0 --- /dev/null +++ b/Package.swift @@ -0,0 +1,5 @@ +import PackageDescription + +let package = Package( + name: "Relayout" +) diff --git a/README.rst b/README.rst index afac1fd..71fcd0b 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,7 @@ Finally, Relayout is not a great tool to use in conjunction with Interface Build Installing ========== -Relayout supports iOS 8.0+, tvOS 9.0+, and OS X 10.10+. You can install Relayout with Carthage, CocoaPods, or manually. +Relayout supports iOS 8.0+, tvOS 9.0+, and OS X 10.10+. You can install Relayout with Carthage, CocoaPods, the Swift package manager, or manually. With CocoaPods -------------- @@ -60,6 +60,13 @@ Add the following to your `Cartfile`:code:. :: github "stevestreza/Relayout" ~> 1.1 +With Swift Package Manager +------------------------- + +Add the following to your `Package.swift`:code: dependencies. :: + + .Package(url: "https://github.com/stevestreza/Relayout.git", majorVersion: 1) + Manually -------- diff --git a/Relayout.xcodeproj/project.pbxproj b/Relayout.xcodeproj/project.pbxproj index bfafabc..8032449 100644 --- a/Relayout.xcodeproj/project.pbxproj +++ b/Relayout.xcodeproj/project.pbxproj @@ -149,6 +149,7 @@ isa = PBXGroup; children = ( 9BC247281D85128400A8E79B /* Configuration */, + A7EC54FF1D51B20B00A579B9 /* Sources */, A7EC54E41D51B15200A579B9 /* Framework */, A7EC54F01D51B15300A579B9 /* Tests */, A70D4A4E1D51D29E00DD71AE /* Sample App */, @@ -169,8 +170,8 @@ A7EC54E41D51B15200A579B9 /* Framework */ = { isa = PBXGroup; children = ( - A7EC54FF1D51B20B00A579B9 /* Layout */, - A7EC54FE1D51B1FF00A579B9 /* Support Files */, + A7EC54E51D51B15200A579B9 /* Relayout.h */, + A7EC54E71D51B15300A579B9 /* Relayout-Info.plist */, ); path = Framework; sourceTree = ""; @@ -185,16 +186,7 @@ path = RelayoutTests; sourceTree = ""; }; - A7EC54FE1D51B1FF00A579B9 /* Support Files */ = { - isa = PBXGroup; - children = ( - A7EC54E51D51B15200A579B9 /* Relayout.h */, - A7EC54E71D51B15300A579B9 /* Relayout-Info.plist */, - ); - name = "Support Files"; - sourceTree = ""; - }; - A7EC54FF1D51B20B00A579B9 /* Layout */ = { + A7EC54FF1D51B20B00A579B9 /* Sources */ = { isa = PBXGroup; children = ( A7EC55021D51B24200A579B9 /* LayingOut.swift */, @@ -207,7 +199,7 @@ A782C3FE1D5311E20080701E /* ListLayout.swift */, 9BC247241D850FD500A8E79B /* PlatformSupport.swift */, ); - path = Layout; + path = Sources; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/Framework/Layout/ConditionalLayout.swift b/Sources/ConditionalLayout.swift similarity index 100% rename from Framework/Layout/ConditionalLayout.swift rename to Sources/ConditionalLayout.swift diff --git a/Framework/Layout/IdentifierLayout.swift b/Sources/IdentifierLayout.swift similarity index 100% rename from Framework/Layout/IdentifierLayout.swift rename to Sources/IdentifierLayout.swift diff --git a/Framework/Layout/LayingOut.swift b/Sources/LayingOut.swift similarity index 100% rename from Framework/Layout/LayingOut.swift rename to Sources/LayingOut.swift diff --git a/Framework/Layout/Layout.swift b/Sources/Layout.swift similarity index 100% rename from Framework/Layout/Layout.swift rename to Sources/Layout.swift diff --git a/Framework/Layout/LayoutGroup.swift b/Sources/LayoutGroup.swift similarity index 100% rename from Framework/Layout/LayoutGroup.swift rename to Sources/LayoutGroup.swift diff --git a/Framework/Layout/ListLayout.swift b/Sources/ListLayout.swift similarity index 100% rename from Framework/Layout/ListLayout.swift rename to Sources/ListLayout.swift diff --git a/Framework/Layout/PlatformSupport.swift b/Sources/PlatformSupport.swift similarity index 100% rename from Framework/Layout/PlatformSupport.swift rename to Sources/PlatformSupport.swift diff --git a/Framework/Layout/TraitCollectionLayout.swift b/Sources/TraitCollectionLayout.swift similarity index 100% rename from Framework/Layout/TraitCollectionLayout.swift rename to Sources/TraitCollectionLayout.swift diff --git a/Framework/Layout/ViewLayout.swift b/Sources/ViewLayout.swift similarity index 100% rename from Framework/Layout/ViewLayout.swift rename to Sources/ViewLayout.swift