diff --git a/README.md b/README.md index 3dd3282..bf9118a 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ [![Build Status](https://travis-ci.org/insanoid/SwiftyJSONAccelerator.svg?branch=master)](https://travis-ci.org/insanoid/SwiftyJSONAccelerator) [![codecov](https://codecov.io/gh/insanoid/SwiftyJSONAccelerator/branch/master/graph/badge.svg)](https://codecov.io/gh/insanoid/SwiftyJSONAccelerator) +**Version v1.1.0 Released!** + +- Now generates the correct option `struct` and `class` based on what was selected. + **Version v1.0.0 Released!** - Now generates **Swift 3** and the software itself is upgraded to Swift 3. @@ -13,8 +17,9 @@ Status](https://travis-ci.org/insanoid/SwiftyJSONAccelerator.svg?branch=master)] - Project upgraded with SwiftLint, Travis, CocoaPods etc. ## Download/Installing + - Download the repo, install pods and run the project! -- [Download the .app(v1.0.0)](https://github.com/insanoid/SwiftyJSONAccelerator/releases/download/v1.0.0/SwiftyJSONAccelerator.zip) +- [Download the .app(v1.1.0)](https://github.com/insanoid/SwiftyJSONAccelerator/releases/download/v1.1.0/SwiftyJSONAccelerator.zip).0/SwiftyJSONAccelerator.zip) A swift model generator like the Objective-C [JSONAccelerator](http://nerdery.com/json-accelerator). Formats and generates models for the given JSON and also breaks them into files making it easy to manage and share between several models. diff --git a/SwiftyJSONAccelerator/Support/Info.plist b/SwiftyJSONAccelerator/Support/Info.plist index 6a126ac..f2efc1a 100644 --- a/SwiftyJSONAccelerator/Support/Info.plist +++ b/SwiftyJSONAccelerator/Support/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.1.0 CFBundleSignature ???? CFBundleVersion - 6 + 7 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/SwiftyJSONAccelerator/UI/SJEditorViewController.swift b/SwiftyJSONAccelerator/UI/SJEditorViewController.swift index baaed6c..82af2ed 100644 --- a/SwiftyJSONAccelerator/UI/SJEditorViewController.swift +++ b/SwiftyJSONAccelerator/UI/SJEditorViewController.swift @@ -123,7 +123,7 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate { if object != nil { let nsCodingState = self.enableNSCodingSupportCheckbox.state == 1 && (modelTypeSelectorSegment.selectedSegment == 1) - let constructType = self.modelTypeSelectorSegment.selectedSegment == 0 ? ConstructType.ClassType : ConstructType.StructType + let constructType = self.modelTypeSelectorSegment.selectedSegment == 0 ? ConstructType.StructType : ConstructType.ClassType let libraryType = self.librarySelector.indexOfSelectedItem == 0 ? JSONMappingLibrary.SwiftyJSON : JSONMappingLibrary.ObjectMapper let configuration = ModelGenerationConfiguration.init( filePath: filePath!.appending("/"), @@ -160,7 +160,7 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate { let notification = NSUserNotification() notification.title = "SwiftyJSONAccelerator" if completionState && fileCount > 0 { - notification.subtitle = "Completed - \(fileCount) Generated." + notification.subtitle = "Completed - \(fileCount) Files Generated" } else { notification.subtitle = "No files were generated, cannot model arrays inside arrays." }