Updated Carthage dependencies, implemented auto-zoom for circle resizing

Author: raysarebest

.gitignore

@@ -46,10 +46,7 @@ playground.xcworkspace
 Pods/
 
 # Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
 
 # fastlane
@@ -83,4 +80,8 @@ categories.json
 
 .vscode
 __pycache__
-__pycache__/*
+__pycache__/*
+
+# Cache Server's Source Tree
+cache-server
+cache-server/*

Cartfile

@@ -1,5 +1,5 @@
-github "raysarebest/das-quadrat" "no-categories-cache" # Change this back to Constantine-Fry once they accept my PR
-github "SwiftyJSON/SwiftyJSON"
 github "raysarebest/MultiSelectSegmentedControl" "framework" # Change this back to yonat once they accept my PR
 github "raysarebest/TagListView" "raysarebest-develop" # Change this back to ElaWorkshop once they accept my PRs
-github "realm/realm-cocoa"
+github "Alamofire/Alamofire"
+github "SwiftyJSON/SwiftyJSON"
+github "SwiftyJSON/Alamofire-SwiftyJSON" "master"

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "SwiftyJSON/SwiftyJSON" "3.1.4"
+github "Alamofire/Alamofire" "4.7.2"
+github "SwiftyJSON/Alamofire-SwiftyJSON" "33f7652ee8ed3c9631d8edfa49ce31045fdc7eda"
+github "SwiftyJSON/SwiftyJSON" "4.1.0"
 github "raysarebest/MultiSelectSegmentedControl" "449dfbf8661a44aacbe79a87a1fc21bd1e9829da"
 github "raysarebest/TagListView" "12a8d9ca149aa38d71c9bc03f62b834cb53df8e1"
-github "raysarebest/das-quadrat" "7d29a47680243c96e1c291e9b0eb74c19f29db70"
-github "realm/realm-cocoa" "v2.10.2"

Carthage/Checkouts/SwiftyJSON/.travis.yml

@@ -1,27 +1,8 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9.3
 xcode_sdk: iphonesimulator10.0
-env:
-  global:
-  - FRAMEWORK_NAME=SwiftyJSON
-before_install:
-- rvm get head
-- brew update
-- brew outdated carthage || brew upgrade carthage
-before_deploy:
-- carthage build --no-skip-current
-- carthage archive $FRAMEWORK_NAME
 script:
 - set -o pipefail
 - travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
-- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON OSX" build-for-testing test | xcpretty
-- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON tvOS" -destination "platform=tvOS Simulator,name=Apple TV 1080p" build-for-testing test | xcpretty
-deploy:
-  provider: releases
-  api_key:
-    secure: MufQRIzcHPU5fn9gyXl7kDGaLihN6zGABx9UWqNtkwq0AxV0aYNWys11nrKDIgoZFR+MbQHMoodpZK03yDdCLG03ncnOr3aytLOpI0imuDFWx16sieiVoYmnP5bfNFTN0qqXdfBy0OOsx4wO+F5Pwg5y1TgGYnKpXtEfdIU3Om4=
-  file: SwiftyJSON.framework.zip
-  skip_cleanup: true
-  on:
-    repo: SwiftyJSON/SwiftyJSON
-    tags: true
+- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON macOS" build-for-testing test | xcpretty
+- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON tvOS" -destination "platform=tvOS Simulator,name=Apple TV" build-for-testing test | xcpretty

Carthage/Checkouts/SwiftyJSON/Example/Example.xcodeproj/project.pbxproj

@@ -124,7 +124,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = swiftyjson;
 				TargetAttributes = {
 					A82A1C1819D926B8009A653D = {
@@ -206,14 +206,22 @@
 				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_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;
@@ -254,14 +262,22 @@
 				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_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;

Carthage/Checkouts/SwiftyJSON/Example/Example/AppDelegate.swift

@@ -1,4 +1,4 @@
-//  SwiftyJSON.h
+//  AppDelegate.swift
 //
 //  Copyright (c) 2014 - 2016 Pinglin Tang
 //
@@ -29,23 +29,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        
+
         let navigationController = self.window?.rootViewController as! UINavigationController
         let viewController = navigationController.topViewController as! ViewController
-        
+
         if let file = Bundle.main.path(forResource: "SwiftyJSONTests", ofType: "json") {
             do {
                 let data = try Data(contentsOf: URL(fileURLWithPath: file))
-                let json = JSON(data: data)
+                let json = try JSON(data: data)
                 viewController.json = json
             } catch {
                 viewController.json = JSON.null
             }
         } else {
             viewController.json = JSON.null
         }
-        
+
         return true
     }
 }
-

Carthage/Checkouts/SwiftyJSON/Example/Example/ViewController.swift

@@ -1,4 +1,4 @@
-//  SwiftyJSON.h
+//  ViewController.swift
 //
 //  Copyright (c) 2014 - 2016 Pinglin Tang
 //
@@ -26,16 +26,16 @@ import SwiftyJSON
 class ViewController: UITableViewController {
 
     var json: JSON = JSON.null
-    
+
     // MARK: - Table view data source
 
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
+	override func viewDidLoad() {
+		title = "SwiftyJSON(\(json.type))"
+	}
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch self.json.type {
-        case Type.array, Type.dictionary:
+        case .array, .dictionary:
             return self.json.count
         default:
             return 1
@@ -44,9 +44,9 @@ class ViewController: UITableViewController {
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "JSONCell", for: indexPath) as UITableViewCell
-            
-        let row = (indexPath as NSIndexPath).row
-        
+
+        let row = indexPath.row
+
         switch self.json.type {
         case .array:
             cell.textLabel?.text = "\(row)"
@@ -60,7 +60,7 @@ class ViewController: UITableViewController {
             cell.textLabel?.text = ""
             cell.detailTextLabel?.text = self.json.description
         }
-        
+
         return cell
     }
 
@@ -70,9 +70,9 @@ class ViewController: UITableViewController {
 
         var nextController: UIViewController?
         nextController = segue.destination
-        
+
         if let indexPath = self.tableView.indexPathForSelectedRow {
-            let row = (indexPath as NSIndexPath).row
+            let row = indexPath.row
             var nextJson: JSON = JSON.null
             switch self.json.type {
             case .array: