Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmartinelli
vmartinelli committed Feb 22, 2016
2 parents d72b83f + abe3474 commit de6a766
Show file tree
Hide file tree
Showing 27 changed files with 119 additions and 54 deletions.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftAppKit.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftCoreData.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftCoreImage.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions ACDGen/Bin/ACDGen.app/Contents/Info.plist
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15C31f</string>
<string>15E39d</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -19,29 +19,29 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0</string>
<string>2.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>55</string>
<string>58</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7C46t</string>
<string>7C1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>15C31c</string>
<string>15C43</string>
<key>DTSDKName</key>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0720</string>
<string>0721</string>
<key>DTXcodeBuild</key>
<string>7C46t</string>
<string>7C1002</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>
Expand Down
Binary file modified ACDGen/Bin/ACDGen.app/Contents/MacOS/ACDGen
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist
View file
Binary file not shown.
Binary file modified ACDGen/Bin/ACDGen.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib
View file
Binary file not shown.
Binary file modified ...DGen.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
View file
Binary file not shown.
Binary file modified .../ACDGen.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib
View file
Binary file not shown.
63 changes: 43 additions & 20 deletions ACDGen/Bin/ACDGen.app/Contents/_CodeSignature/CodeResources
View file
Expand Up @@ -12,7 +12,7 @@
<dict>
<key>hash</key>
<data>
pX9OFxPYXPJcG39Wrz6C6JdqjbY=
e3Pmh1BMF5buQz0AbTP9VBLcILc=
</data>
<key>optional</key>
<true/>
Expand All @@ -21,7 +21,7 @@
<dict>
<key>hash</key>
<data>
54bFCWuirynG3en7KOFAVV4NuMw=
Qo3MOim8HddqD68GiRDH7XZNUs4=
</data>
<key>optional</key>
<true/>
Expand All @@ -30,7 +30,7 @@
<dict>
<key>hash</key>
<data>
SIYboR5g7cFQgMuiyz60trQRar4=
8WOBw9GAXoACMl+4iqfP41/bsI4=
</data>
<key>optional</key>
<true/>
Expand All @@ -39,7 +39,7 @@
<dict>
<key>hash</key>
<data>
v1Nm0UqLRECl/jG7ahVcjUOv4A8=
OEuKPP/GuTzcRiRM0R3pFMMrNH8=
</data>
<key>optional</key>
<true/>
Expand All @@ -51,7 +51,7 @@
<dict>
<key>cdhash</key>
<data>
639GGbGFKaBlDcE6CozMLGLtFOI=
GS2GNFulLhdI8mLTycJmJ9q7cjM=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftAppKit" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -60,7 +60,7 @@
<dict>
<key>cdhash</key>
<data>
jtSh/1wN4p0rNkAQ1KcaQZZdfs8=
0Yjiv77BqxZY5wpb4wkezLgpU8c=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftCore" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -69,7 +69,7 @@
<dict>
<key>cdhash</key>
<data>
yhQv9G+JfequP0uFt6bOFowtTH8=
LdJtD8LZM7/QEWd0Omofwfejz2I=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftCoreData" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -78,7 +78,7 @@
<dict>
<key>cdhash</key>
<data>
xpYBbkbTm5HCvZj/H8x9/UZBMR8=
0T1EfpLu5ONUmjFrDv7+nzHUTXA=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftCoreGraphics" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -87,7 +87,7 @@
<dict>
<key>cdhash</key>
<data>
eJ69tUN6pqYlSTzV5emJ6ArojDs=
hYtZIfb41Qb6LB099a+e7yF0hRo=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftCoreImage" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -96,7 +96,7 @@
<dict>
<key>cdhash</key>
<data>
muH0+/el5vfsnaBuu2IfjlXTx3M=
CaP3c4qNeJ50HqnKOac4Ij+0H58=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftDarwin" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -105,7 +105,7 @@
<dict>
<key>cdhash</key>
<data>
o4YAC1eLClufrj+gbWmPewzqeiU=
KLDXsqblS/Hv9c/e8sGImHRoaf0=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftDispatch" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -114,7 +114,7 @@
<dict>
<key>cdhash</key>
<data>
10arWKmQNVjmNnUmSlLagvl/hPs=
oNUzYGBgzM/o5b4FeBtWRpOV2Oc=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftFoundation" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
Expand All @@ -123,20 +123,31 @@
<dict>
<key>cdhash</key>
<data>
WrgXcInufRnG9BqFeFRA9hVDsNQ=
gjPEgrTLc7sbHYcFcr+jtxOJKDs=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.apple.dt.runtime.swiftObjectiveC" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "89GFVQ5PK6")</string>
</dict>
<key>Resources/AppIcon.icns</key>
<data>
4fENz3XO2GJcyBkjfMf2yZh6m48=
</data>
<dict>
<key>hash</key>
<data>
4fENz3XO2GJcyBkjfMf2yZh6m48=
</data>
<key>hash2</key>
<data>
o1UIh+cQbn+Gnr6GrvJIKJLdpxIPOjGjC0PCcg8VF/M=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<dict>
<key>hash</key>
<data>
pX9OFxPYXPJcG39Wrz6C6JdqjbY=
e3Pmh1BMF5buQz0AbTP9VBLcILc=
</data>
<key>hash2</key>
<data>
BMVAX90biQabvLBERaNGFYrTVesT4mSLS/Ie1RUbHxE=
</data>
<key>optional</key>
<true/>
Expand All @@ -145,7 +156,11 @@
<dict>
<key>hash</key>
<data>
54bFCWuirynG3en7KOFAVV4NuMw=
Qo3MOim8HddqD68GiRDH7XZNUs4=
</data>
<key>hash2</key>
<data>
74VnO5OR5igMuAX4YLAAJQpkvpR3KZnEObO/61GQ5WE=
</data>
<key>optional</key>
<true/>
Expand All @@ -154,7 +169,11 @@
<dict>
<key>hash</key>
<data>
SIYboR5g7cFQgMuiyz60trQRar4=
8WOBw9GAXoACMl+4iqfP41/bsI4=
</data>
<key>hash2</key>
<data>
ItSZDzlpP2/926ROeFdlD7dssNx+BTuALVmPW2QSy8o=
</data>
<key>optional</key>
<true/>
Expand All @@ -163,7 +182,11 @@
<dict>
<key>hash</key>
<data>
v1Nm0UqLRECl/jG7ahVcjUOv4A8=
OEuKPP/GuTzcRiRM0R3pFMMrNH8=
</data>
<key>hash2</key>
<data>
hLVwDYTuzhMHXAwTzZkSBgLaIl0p8Vro02B8cnnxwt8=
</data>
<key>optional</key>
<true/>
Expand Down
6 changes: 4 additions & 2 deletions ACDGen/Source/ACDGen.xcodeproj/project.pbxproj
View file
Expand Up @@ -301,8 +301,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 55;
CURRENT_PROJECT_VERSION = 58;
INFOPLIST_FILE = ACDGen/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.alecrim.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -315,8 +316,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 55;
CURRENT_PROJECT_VERSION = 58;
INFOPLIST_FILE = ACDGen/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.alecrim.$(PRODUCT_NAME:rfc1034identifier)";
Expand Down
33 changes: 22 additions & 11 deletions ACDGen/Source/ACDGen/Base.lproj/Main.storyboard
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="7528.3" systemVersion="14D113c" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7528.3"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<scenes>
<!--Application-->
Expand Down Expand Up @@ -668,27 +668,27 @@
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="ACDGen" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="215"/>
<rect key="frame" x="0.0" y="0.0" width="480" height="235"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="t1W-Gu-dbd">
<rect key="frame" x="62" y="178" width="76" height="17"/>
<rect key="frame" x="62" y="198" width="76" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="DataModel" id="i2f-z5-RIG">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="71x-Zd-fgp">
<rect key="frame" x="142" y="178" width="320" height="17"/>
<rect key="frame" x="142" y="198" width="320" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="rnK-Cv-JMy">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x0R-ll-Lc6">
<rect key="frame" x="138" y="169" width="97" height="32"/>
<rect key="frame" x="138" y="189" width="97" height="32"/>
<buttonCell key="cell" type="push" title="Choose..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="acY-Fc-Qqq">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -698,35 +698,45 @@
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JGa-wg-pa2">
<rect key="frame" x="18" y="150" width="120" height="17"/>
<rect key="frame" x="18" y="170" width="120" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="DataContext name" id="qKe-Rm-qu7">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T4h-gh-6PT">
<rect key="frame" x="85" y="125" width="53" height="17"/>
<rect key="frame" x="85" y="145" width="53" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Options" id="efQ-kC-L0q">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="phf-mL-PX2">
<rect key="frame" x="144" y="148" width="316" height="22"/>
<rect key="frame" x="144" y="168" width="316" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="TKs-QO-77a">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QAB-09-vif">
<rect key="frame" x="142" y="123" width="320" height="18"/>
<rect key="frame" x="142" y="143" width="320" height="18"/>
<buttonCell key="cell" type="check" title="Use scalar properties for primitive data types" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="FF0-6d-c9d">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="useScalarPropertiesButtonPressed:" target="XfG-lQ-9wD" id="Gt7-cP-bh8"/>
</connections>
</button>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F4X-gO-pYR">
<rect key="frame" x="154" y="123" width="308" height="18"/>
<buttonCell key="cell" type="check" title="Use Swift String for string types" bezelStyle="regularSquare" imagePosition="left" enabled="NO" state="on" inset="2" id="5LD-TE-bPb">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xGP-Ht-gqy">
<rect key="frame" x="142" y="103" width="320" height="18"/>
Expand Down Expand Up @@ -768,11 +778,12 @@
<outlet property="generateQueryAttributesCheckBox" destination="xGP-Ht-gqy" id="RZ5-Kg-DRe"/>
<outlet property="gererateButton" destination="ycT-BL-A2k" id="FpD-rB-Rmk"/>
<outlet property="useScalarPropertiesCheckBox" destination="QAB-09-vif" id="0NK-n6-siQ"/>
<outlet property="useSwiftStringCheckBox" destination="F4X-gO-pYR" id="mgb-Ts-rgK"/>
</connections>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="627.5"/>
<point key="canvasLocation" x="75" y="637.5"/>
</scene>
</scenes>
</document>
8 changes: 7 additions & 1 deletion ACDGen/Source/ACDGen/CodeGenerator.swift
View file
Expand Up @@ -77,7 +77,13 @@ extension CodeGenerator {
}

if let attributeValueClassName = attributeDescription.attributeValueClassName {
return attributeValueClassName
// If not using scalar but using Swift String
if attributeDescription.attributeType == .StringAttributeType && self.parameters.useSwiftString {
return "String"
}
else {
return attributeValueClassName
}
}
else {
// If your attribute is of NSTransformableAttributeType, the attributeValueClassName must be set or attribute value class must implement NSCopying.
Expand Down
1 change: 1 addition & 0 deletions ACDGen/Source/ACDGen/CodeGeneratorParameters.swift
View file
Expand Up @@ -17,6 +17,7 @@ public struct CodeGeneratorParameters {
public let targetFolderURL: NSURL
public let dataContextName: String
public let useScalarProperties: Bool
public let useSwiftString: Bool
public let generateQueryAttributes: Bool
public let addPublicAccessModifier: Bool

Expand Down
2 changes: 1 addition & 1 deletion ACDGen/Source/ACDGen/Info.plist
View file
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0</string>
<string>2.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit de6a766

Please sign in to comment.