Skip to content
This repository has been archived by the owner on Mar 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #132 from el-hoshino/version/3.3.0
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
Elvis Shi authored Apr 30, 2019
2 parents 68bdc04 + 58d6f75 commit 232517e
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 17 deletions.
4 changes: 2 additions & 2 deletions NotAutoLayout.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "NotAutoLayout"
s.version = "3.2.0"
s.version = "3.3.0"
s.summary = "Layout your views without Auto Layout constraints, in a much more swifty way."

# This description is used to generate tags and improve search results.
Expand Down Expand Up @@ -62,7 +62,7 @@ Pod::Spec.new do |s|
#

s.platform = :ios, "9.0"
s.swift_version = "4.2"
s.swift_version = "5.0"

# When using multiple platforms
# s.ios.deployment_target = "5.0"
Expand Down
19 changes: 11 additions & 8 deletions NotAutoLayout/NotAutoLayout.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -886,29 +886,30 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "史翔新";
TargetAttributes = {
7983788A1E4CB2B100D3E1C2 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = KC8N9BMQJY;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
798378931E4CB2B200D3E1C2 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = KC8N9BMQJY;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 798378851E4CB2B100D3E1C2 /* Build configuration list for PBXProject "NotAutoLayout" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 798378811E4CB2B100D3E1C2;
productRefGroup = 7983788C1E4CB2B100D3E1C2 /* Products */;
Expand Down Expand Up @@ -1155,6 +1156,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -1216,6 +1218,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -1284,7 +1287,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1305,7 +1308,7 @@
PRODUCT_BUNDLE_IDENTIFIER = net.crazism.NotAutoLayout;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -1318,7 +1321,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.crazism.NotAutoLayoutTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1331,7 +1334,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.crazism.NotAutoLayoutTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
31 changes: 31 additions & 0 deletions NotAutoLayout/NotAutoLayout/Layout/ViewLayoutGuide.swift
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.right

@unknown default:
assertionFailure()
return self.left
}
}

Expand All @@ -142,6 +146,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.left

@unknown default:
assertionFailure()
return self.right
}
}

Expand All @@ -152,6 +160,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.topRight

@unknown default:
assertionFailure()
return self.topLeft
}
}

Expand All @@ -162,6 +174,9 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.topLeft

@unknown default:
return self.topRight
}
}

Expand All @@ -172,6 +187,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.middleRight

@unknown default:
assertionFailure()
return self.middleLeft
}
}

Expand All @@ -182,6 +201,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.middleLeft

@unknown default:
assertionFailure()
return self.middleRight
}
}

Expand All @@ -192,6 +215,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.bottomRight

@unknown default:
assertionFailure()
return self.bottomLeft
}
}

Expand All @@ -202,6 +229,10 @@ extension ViewLayoutGuides.Guide: LayoutGuideRepresentable {

case .rightToLeft:
return self.bottomLeft

@unknown default:
assertionFailure()
return self.bottomRight
}
}

Expand Down
32 changes: 32 additions & 0 deletions NotAutoLayout/NotAutoLayout/Layout/ViewPinGuide.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ extension ViewPinGuides.Horizontal.Guide: HorizontalPinGuideRepresentable {

case .rightToLeft:
return self.right

@unknown default:
assertionFailure()
return self.left
}
}

Expand All @@ -62,6 +66,10 @@ extension ViewPinGuides.Horizontal.Guide: HorizontalPinGuideRepresentable {

case .rightToLeft:
return self.left

@unknown default:
assertionFailure()
return self.right
}
}

Expand Down Expand Up @@ -172,6 +180,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.topRight

@unknown default:
assertionFailure()
return self.topLeft
}
}

Expand All @@ -182,6 +194,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.topLeft

@unknown default:
assertionFailure()
return self.topRight
}
}

Expand All @@ -192,6 +208,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.middleRight

@unknown default:
assertionFailure()
return self.middleLeft
}
}

Expand All @@ -202,6 +222,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.middleLeft

@unknown default:
assertionFailure()
return self.middleRight
}
}

Expand All @@ -212,6 +236,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.bottomRight

@unknown default:
assertionFailure()
return self.bottomLeft
}
}

Expand All @@ -222,6 +250,10 @@ extension ViewPinGuides.Point.Guide: PointPinGuideRepresentable {

case .rightToLeft:
return self.bottomLeft

@unknown default:
assertionFailure()
return self.bottomRight
}
}

Expand Down
4 changes: 2 additions & 2 deletions NotAutoLayout/NotAutoLayout/Types/Float.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ extension Float: Equatable {

extension Float: Hashable {

public var hashValue: Int {
return self.value.hashValue
public func hash(into hasher: inout Hasher) {
self.value.hash(into: &hasher)
}

}
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ With NotAutoLayout, you don't need to care about anything like constraints or si
## Requirements

- iOS 9.0+
- Xcode 10.0+
- Swift 4.2+
- Xcode 10.2+
- Swift 5.0+

## Installation

Expand All @@ -37,7 +37,7 @@ With NotAutoLayout, you don't need to care about anything like constraints or si
- Add the following line to your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile):

```txt
github "el-hoshino/NotAutoLayout" ~> 3.2
github "el-hoshino/NotAutoLayout" ~> 3.3
```

- Run `carthage update`.
Expand All @@ -49,7 +49,7 @@ github "el-hoshino/NotAutoLayout" ~> 3.2
- Specify NotAutoLayout in your [Podfile](https://guides.cocoapods.org/syntax/podfile.html) like following:

```txt
pod 'NotAutoLayout', `~> 3.2`
pod 'NotAutoLayout', `~> 3.3`
```

- Run `pod install`.
Expand Down Expand Up @@ -272,6 +272,12 @@ To provide the API to make a frame, NotAutoLayout contains a lot of `LayoutPrope
- [ ] Some `LayoutProperty`s are not declared yet,
- [ ] Matrical layout is not implemented yet.

## Expects in version 4.0

You may notice that I've made a new framework [SteinsKit](https://github.com/el-hoshino/SteinsKit). In that framework, I've made the structure more refined with bootstrap scripts, Danger implements for better CI runnings, and the most important thing, Sourcery implements for meta programming! These features will join NotAutoLayout in version 4.0!

But the problem is, I don't have an actual plan yet for when exactly to release 4.0. Hopefully I can implement them after WWDC or some time.

## License

NotAutoLayout is released under the Apache license. See [LICENSE](LICENSE) for details.
Expand Down

0 comments on commit 232517e

Please sign in to comment.