Merge pull request #10 from realm-demos/mt/swift4-cocoa3

[WIP] Swift 4 / RealmSwift 3 update

Example/Podfile

@@ -1,7 +1,7 @@
 use_frameworks!
 
 target 'RealmContent_Example' do
-  pod 'RealmSwift'
+  pod 'RealmSwift', '~> 3'
 
   pod 'RealmContent', :path => '../'
   pod 'RealmContent/Markdown', :path => '../'
@@ -10,3 +10,16 @@ target 'RealmContent_Example' do
     inherit! :search_paths
   end
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      next unless target.name.include?("RealmSwift") ||
+      target.name.include?("Kingfisher") ||
+      target.name.include?("MMMarkdown") ||
+      target.name.include?("RealmContent")
+
+      config.build_settings['SWIFT_VERSION'] = '4.0'
+    end
+  end
+end

Example/RealmContent.xcodeproj/project.pbxproj

@@ -268,7 +268,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -503,14 +503,20 @@
 				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_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_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;
@@ -550,14 +556,20 @@
 				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_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_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;
@@ -595,7 +607,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -612,7 +624,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -633,7 +645,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -650,7 +662,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Example/RealmContent.xcodeproj/xcshareddata/xcschemes/RealmContent-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/RealmContent/Entities.swift

@@ -8,12 +8,12 @@ import Foundation
 import RealmSwift
 
 class Dog: Object {
-    dynamic var name = ""
-    dynamic var age = 0
+    @objc dynamic var name = ""
+    @objc dynamic var age = 0
 }
 
 class Person: Object {
-    dynamic var name = ""
-    dynamic var picture: NSData? = nil
+    @objc dynamic var name = ""
+    @objc dynamic var picture: NSData? = nil
     let dogs = List<Dog>()
 }

RealmContent.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'RealmContent'
-  s.version          = '0.2.3'
+  s.version          = '0.2.4'
   s.summary          = 'Realm powered content management system'
 
   s.description      = <<-DESC
@@ -21,8 +21,8 @@ Realm powered content management system providing built-in view controllers and
 
   s.frameworks = 'UIKit'
 
-  s.dependency 'RealmSwift', '~> 2'
-  s.dependency 'Kingfisher', '~> 3'
+  s.dependency 'RealmSwift', '~> 3'
+  s.dependency 'Kingfisher', '~> 4'
   s.dependency 'NSString+Color'
 
   s.default_subspec = 'Core'
@@ -36,4 +36,6 @@ Realm powered content management system providing built-in view controllers and
 
     cs.source_files = 'RealmContent/Entities/*', 'RealmContent/Markdown/Classes/*', 'RealmContent/Markdown/View/*'
   end
+
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
 end

RealmContent/Core/Classes/ContentListDataSource.swift

@@ -102,7 +102,7 @@ public class ContentListDataSource: NSObject {
             // sort the pages by priority
             results = results!.sorted(byKeyPath: keyPriority, ascending: false)
 
-            resultsToken = results?.addNotificationBlock { [weak self] change in
+            resultsToken = results?.observe { [weak self] change in
                 guard let view = self?.view else { return }
                 if let tableView = view as? UITableView { tableView.reloadData() }
                 if let collectionView = view as? UICollectionView { collectionView.reloadData() }
@@ -124,7 +124,7 @@ public class ContentListDataSource: NSObject {
                     SortDescriptor(keyPath: keyPriority, ascending: false)
                     ])
 
-            resultsToken = results?.addNotificationBlock { [weak self] change in
+            resultsToken = results?.observe { [weak self] change in
                 guard let this = self else { return }
 
                 switch change {

RealmContent/Core/View/ContentViewController.swift

@@ -88,14 +88,14 @@ public class ContentViewController: UIViewController, UITableViewDataSource, UIT
     }
 
     private func observe(page: ContentPage) {
-        pageUpdatesToken?.stop()
-        pageElementsUpdatesToken?.stop()
+        pageUpdatesToken?.invalidate()
+        pageElementsUpdatesToken?.invalidate()
 
         // load the page content
         populateFrom(page: page)
 
         // enable updates
-        pageUpdatesToken = page.addNotificationBlock() { [weak self] change in
+        pageUpdatesToken = page.observe() { [weak self] change in
             switch change {
             case .change(let properties):
                 for p in properties {
@@ -112,7 +112,7 @@ public class ContentViewController: UIViewController, UITableViewDataSource, UIT
 
         pageElementsUpdatesToken = page.elements
             .filter(NSPredicate(format: "type in %@", ContentElement.Kind.allRawValues()))
-            .addNotificationBlock(applyChanges)
+            .observe(applyChanges)
     }
 
     private func populateFrom(page: ContentPage) {

RealmContent/Core/View/ImageContentCell.swift

@@ -51,7 +51,7 @@ public class ImageContentCell: UITableViewCell {
         contentView.addSubview(img)
 
         heightConstraint = contentView.heightAnchor.constraint(equalToConstant: 20)
-        heightConstraint.priority = 500
+        heightConstraint.priority = UILayoutPriority.defaultLow
         heightConstraint.isActive = true
     }
 
@@ -124,7 +124,7 @@ public class ImageContentCell: UITableViewCell {
         return image
     }
 
-    internal func didTap() {
+    @objc internal func didTap() {
         guard let url = url else { return }
         img.alpha = 0.67
         UIView.animate(withDuration: 0.33, animations: {

RealmContent/Core/View/TextContentCell.swift

@@ -132,7 +132,7 @@ public class TextContentCell: UITableViewCell {
 
     // MARK: - private methods
 
-    internal func didTap() {
+    @objc internal func didTap() {
         guard let url = url else { return }
         label.alpha = 0.5
         UIView.animate(withDuration: 0.33, animations: {

RealmContent/Entities/ContentElement.swift

@@ -21,10 +21,9 @@ public class ContentElement: Object {
     }
 
 
-    public dynamic var type = "p"
-    public dynamic var content = ""
-    public dynamic var url: String?
-
+    @objc public dynamic var type = "p"
+    @objc public dynamic var content = ""
+    @objc public dynamic var url: String?
 }
 
 extension ContentElement {

RealmContent/Entities/ContentPage.swift

@@ -10,13 +10,13 @@ import RealmSwift
 /// represents a single content page - news article, blog post, announcement, etc.
 public class ContentPage: Object {
 
-    public dynamic var title: String?
+    @objc public dynamic var title: String?
     public let elements = List<ContentElement>()
-    public dynamic var priority = 0
-    public dynamic var mainColor: String?
-    public dynamic var lang: String?
-    public dynamic var tag = ""
-    public dynamic var uuid = UUID().uuidString
+    @objc public dynamic var priority = 0
+    @objc public dynamic var mainColor: String?
+    @objc public dynamic var lang: String?
+    @objc public dynamic var tag = ""
+    @objc public dynamic var uuid = UUID().uuidString
 
     override public static func indexedProperties() -> [String] {
         return ["priority", "tag"]

RealmContent/Markdown/View/MarkdownViewController.swift

@@ -39,22 +39,22 @@ public class MarkdownViewController: UIViewController {
 
     // dynamically update the content
     private func observe(page: ContentPage) {
-        pageUpdatesToken?.stop()
-        pageElementsUpdatesToken?.stop()
+        pageUpdatesToken?.invalidate()
+        pageElementsUpdatesToken?.invalidate()
 
         // load the page content
         populateFrom(page: page)
 
         // enable updates
-        pageUpdatesToken = page.addNotificationBlock { [weak self] change in
+        pageUpdatesToken = page.observe { [weak self] change in
             switch change {
             case .change: self?.populateFrom(page: page)
             case .deleted: self?.pageUpdatesToken = nil
             default: break
             }
         }
 
-        pageElementsUpdatesToken = page.elements.addNotificationBlock { [weak self] change in
+        pageElementsUpdatesToken = page.elements.observe { [weak self] change in
             switch change {
             case .update: self?.populateFrom(page: page)
             default: break