Skip to content

Commit 78308ee

Browse files
committed
Linux Testing Support & Swift 4 Support; Rearranged Project Directory; Closes #6; Closes #7
1 parent 3919b72 commit 78308ee

23 files changed

+115
-45
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

CHANGELOG.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
###0.9.5
1+
### 0.9.6
2+
- Swift 4 Support
3+
- Linux Testing Support
4+
- Reorganized Project Directory
5+
6+
### 0.9.5
27
- Swift 3 Support
38

4-
###0.9.4
9+
### 0.9.4
510
- SPM support
611
- Made example constraints non-generic
712
- Small code fixes to be more Swifty
813
- Removed Swift 2.2 deprecations
914

10-
###0.9.3
15+
### 0.9.3
1116

12-
###0.9.2
17+
### 0.9.2
1318
Swift 2 support
1419

15-
###0.9.1
20+
### 0.9.1
1621
- Access control bug fix
1722
- Last release with Swift 1.2 support
1823

19-
###0.9.0
24+
### 0.9.0
2025
Initial Stable Release
File renamed without changes.

SwiftCSP/SwiftCSP/Base.lproj/MainMenu.xib renamed to Demo/Base.lproj/MainMenu.xib

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
57
</dependencies>
68
<objects>
79
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -671,12 +673,13 @@
671673
</menu>
672674
</menuItem>
673675
</items>
676+
<point key="canvasLocation" x="212" y="69"/>
674677
</menu>
675678
<window title="SwiftCSP" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
676679
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
677680
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
678681
<rect key="contentRect" x="335" y="390" width="688" height="440"/>
679-
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
682+
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
680683
<view key="contentView" id="EiT-Mj-1SZ">
681684
<rect key="frame" x="0.0" y="0.0" width="688" height="440"/>
682685
<autoresizingMask key="autoresizingMask"/>
@@ -694,7 +697,7 @@
694697
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
695698
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
696699
<tableColumns>
697-
<tableColumn width="60" minWidth="40" maxWidth="1000" id="7lX-xy-ndE">
700+
<tableColumn identifier="" width="60" minWidth="40" maxWidth="1000" id="7lX-xy-ndE">
698701
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Width">
699702
<font key="font" metaFont="smallSystem"/>
700703
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -713,6 +716,7 @@
713716
<subviews>
714717
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sgd-q5-dCb">
715718
<rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
719+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
716720
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="X" id="M7g-JH-iDh">
717721
<numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="dvd-Ta-atY">
718722
<real key="minimum" value="1"/>
@@ -736,7 +740,7 @@
736740
<binding destination="mvl-Ec-mO6" name="value" keyPath="arrangedObjects.width" id="4vZ-32-NZs"/>
737741
</connections>
738742
</tableColumn>
739-
<tableColumn width="60" minWidth="40" maxWidth="1000" id="z1q-Vn-6nn">
743+
<tableColumn identifier="" width="60" minWidth="40" maxWidth="1000" id="z1q-Vn-6nn">
740744
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Height">
741745
<font key="font" metaFont="smallSystem"/>
742746
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -755,6 +759,7 @@
755759
<subviews>
756760
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kp3-8c-PVl">
757761
<rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
762+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
758763
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="X" id="Suw-K0-gVy">
759764
<numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="Vub-Ji-iEt">
760765
<real key="minimum" value="1"/>
@@ -778,7 +783,7 @@
778783
<binding destination="mvl-Ec-mO6" name="value" keyPath="arrangedObjects.height" id="azJ-1p-SJc"/>
779784
</connections>
780785
</tableColumn>
781-
<tableColumn width="109" minWidth="10" maxWidth="3.4028234663852886e+38" id="ms5-gl-0U7">
786+
<tableColumn identifier="" width="109" minWidth="10" maxWidth="3.4028234663852886e+38" id="ms5-gl-0U7">
782787
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Color">
783788
<font key="font" metaFont="smallSystem"/>
784789
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -797,6 +802,7 @@
797802
<subviews>
798803
<colorWell fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rPC-lu-hFJ">
799804
<rect key="frame" x="8" y="-3" width="44" height="23"/>
805+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
800806
<color key="color" red="0.05813049898" green="0.055541899059999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
801807
<connections>
802808
<binding destination="EzY-6c-9vA" name="value" keyPath="objectValue.color" id="f7I-vq-3eT"/>
@@ -816,10 +822,9 @@
816822
</connections>
817823
</tableView>
818824
</subviews>
819-
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
820825
</clipView>
821826
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4wC-h6-NGG">
822-
<rect key="frame" x="1" y="119" width="223" height="15"/>
827+
<rect key="frame" x="1" y="248" width="237" height="16"/>
823828
<autoresizingMask key="autoresizingMask"/>
824829
</scroller>
825830
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="59f-If-C1W">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Package.swift

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
// swift-tools-version:4.0
2+
13
import PackageDescription
24

35
let package = Package(
4-
name: "SwiftCSP"
6+
name: "SwiftCSP",
7+
products: [
8+
.library(
9+
name: "SwiftCSP",
10+
targets: ["SwiftCSP"]),
11+
],
12+
dependencies: [],
13+
targets: [
14+
.target(
15+
name: "SwiftCSP",
16+
dependencies: []),
17+
.testTarget(
18+
name: "SwiftCSPTests",
19+
dependencies: ["SwiftCSP"]),
20+
]
521
)

0 commit comments

Comments
 (0)