Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode10.1
osx_image: xcode11

cache:
- bundler
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'
gem 'cocoapods', '~> 1.6.0.beta.2'
gem 'cocoapods', '~> 1.7'
gem 'jazzy', '0.9'
gem 'xcpretty-travis-formatter'
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.6.2)
cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.5)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
Expand All @@ -22,13 +22,13 @@ GEM
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.2.0, < 3.0)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.2)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand Down Expand Up @@ -100,7 +100,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.6.0.beta.2)
cocoapods (~> 1.7)
jazzy (= 0.9)
xcpretty-travis-formatter

Expand Down
3 changes: 2 additions & 1 deletion PinLayout.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.8.9"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
spec.license = "MIT license"
spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
spec.source_files = "Sources/**/*.swift"
spec.swift_version = '4.2'

spec.ios.deployment_target = '8.0'
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
179 changes: 96 additions & 83 deletions PinLayout.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 9b1d14a0f41ae1e8ebc931fa3d033da6c545223e

COCOAPODS: 1.6.2
COCOAPODS: 1.7.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0830;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = Layoutbox;
TargetAttributes = {
24C872FA1EE2D113007BFE47 = {
Expand All @@ -136,7 +136,7 @@
};
buildConfigurationList = 24C872F61EE2D113007BFE47 /* Build configuration list for PBXProject "PinLayout-Carthage-iOS" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -202,21 +202,30 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -246,6 +255,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -254,21 +264,30 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -290,6 +309,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -311,7 +331,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -330,7 +350,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-Carthage-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,19 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = LayoutBox;
TargetAttributes = {
24C872DC1EE2CE0B007BFE47 = {
CreatedOnToolsVersion = 8.3.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1100;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 24C872D81EE2CE0B007BFE47 /* Build configuration list for PBXProject "PinLayout-iOS" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -170,7 +170,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
"${BUILT_PRODUCTS_DIR}/SwifterSwift/SwifterSwift.framework",
);
Expand All @@ -181,7 +181,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5FB587B98FA7C73E8C04570F /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -241,6 +241,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -300,6 +301,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
Expand Down Expand Up @@ -361,7 +363,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-iOS/PinLayout-iOS-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -377,7 +379,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-iOS/PinLayout-iOS-Bridging-Header.h";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/cocoapods/ios/PinLayout-iOS/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
3 changes: 1 addition & 2 deletions TestProjects/cocoapods/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target 'PinLayout-iOS' do


# Include popular libraries that include UIKit classes extensions to check conflicts with PinLayout.
pod 'SwifterSwift', '4.3'

pod 'SwifterSwift'
end

46 changes: 25 additions & 21 deletions TestProjects/cocoapods/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
PODS:
- PinLayout (1.8.3)
- SwifterSwift (4.3.0):
- SwifterSwift/AppKit (= 4.3.0)
- SwifterSwift/CoreGraphics (= 4.3.0)
- SwifterSwift/CoreLocation (= 4.3.0)
- SwifterSwift/Foundation (= 4.3.0)
- SwifterSwift/MapKit (= 4.3.0)
- SwifterSwift/SwiftStdlib (= 4.3.0)
- SwifterSwift/UIKit (= 4.3.0)
- SwifterSwift/AppKit (4.3.0)
- SwifterSwift/CoreGraphics (4.3.0)
- SwifterSwift/CoreLocation (4.3.0)
- SwifterSwift/Foundation (4.3.0)
- SwifterSwift/MapKit (4.3.0)
- SwifterSwift/SwiftStdlib (4.3.0)
- SwifterSwift/UIKit (4.3.0)
- PinLayout (1.8.9)
- SwifterSwift (5.0.0):
- SwifterSwift/AppKit (= 5.0.0)
- SwifterSwift/CoreGraphics (= 5.0.0)
- SwifterSwift/CoreLocation (= 5.0.0)
- SwifterSwift/Dispatch (= 5.0.0)
- SwifterSwift/Foundation (= 5.0.0)
- SwifterSwift/MapKit (= 5.0.0)
- SwifterSwift/SpriteKit (= 5.0.0)
- SwifterSwift/SwiftStdlib (= 5.0.0)
- SwifterSwift/UIKit (= 5.0.0)
- SwifterSwift/AppKit (5.0.0)
- SwifterSwift/CoreGraphics (5.0.0)
- SwifterSwift/CoreLocation (5.0.0)
- SwifterSwift/Dispatch (5.0.0)
- SwifterSwift/Foundation (5.0.0)
- SwifterSwift/MapKit (5.0.0)
- SwifterSwift/SpriteKit (5.0.0)
- SwifterSwift/SwiftStdlib (5.0.0)
- SwifterSwift/UIKit (5.0.0)

DEPENDENCIES:
- PinLayout (from `../../..`)
- SwifterSwift (= 4.3)
- SwifterSwift

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -29,9 +33,9 @@ EXTERNAL SOURCES:
:path: "../../.."

SPEC CHECKSUMS:
PinLayout: 1330ea0c6324556e7bdb9b36af32a262a97d2ff2
SwifterSwift: f3fce2b9fc5b9d8fda6eec33825e5243c60aebba
PinLayout: f7237c104696f409470947fee3ac82e239cac367
SwifterSwift: 96f90594b370802f01647c2b1229c74a84ffafee

PODFILE CHECKSUM: 8c3f74fbbf7e58ac79bf9c175662d4aa74b1a668
PODFILE CHECKSUM: 0a7937525b5b2e43e75becef489afdd364e0e4ff

COCOAPODS: 1.5.3
COCOAPODS: 1.7.5
Loading