realm / realm-tasks

To Do app built with Realm, inspired by Clear for iOS
Other
368 stars 73 forks source link

Merge/update Swift 3 branch #368

Closed ewerx closed 7 years ago

ewerx commented 7 years ago

Needed this branch to test something so I merged master and updated the pods to get it working.

jpsim commented 7 years ago

Thanks for the PR, @ewerx! @TimOliver's responsible for this repo, but he's on holiday break right now, so hopefully it won't be too long before he's able to review.

jpsim commented 7 years ago

It also seems that SWIFT_VERSION needs to be changed from 3.0.1 to 3.0:

diff --git a/RealmTasks Apple/RealmTasks.xcodeproj/project.pbxproj b/RealmTasks Apple/RealmTasks.xcodeproj/project.pbxproj
index 8b4cde9..d75a5fe 100644
--- a/RealmTasks Apple/RealmTasks.xcodeproj/project.pbxproj 
+++ b/RealmTasks Apple/RealmTasks.xcodeproj/project.pbxproj 
@@ -737,7 +737,7 @@
                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
                PRODUCT_BUNDLE_IDENTIFIER = "io.realm.RealmTasks-iOS-Tests";
                PRODUCT_NAME = "$(TARGET_NAME)";
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
                TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RealmTasks.app/RealmTasks";
            };
            name = Debug;
@@ -753,7 +753,7 @@
                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
                PRODUCT_BUNDLE_IDENTIFIER = "io.realm.RealmTasks-iOS-Tests";
                PRODUCT_NAME = "$(TARGET_NAME)";
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
                TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RealmTasks.app/RealmTasks";
            };
            name = Release;
@@ -771,7 +771,7 @@
                MACOSX_DEPLOYMENT_TARGET = 10.10;
                PRODUCT_BUNDLE_IDENTIFIER = io.realm.realmtasks.macos;
                SDKROOT = macosx;
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
            };
            name = Debug;
        };
@@ -788,7 +788,7 @@
                MACOSX_DEPLOYMENT_TARGET = 10.10;
                PRODUCT_BUNDLE_IDENTIFIER = io.realm.realmtasks.macos;
                SDKROOT = macosx;
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
            };
            name = Release;
        };
@@ -835,6 +835,7 @@
                OTHER_SWIFT_FLAGS = "-DDEBUG";
                PRODUCT_NAME = RealmTasks;
                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+               SWIFT_VERSION = 3.0;
            };
            name = Debug;
        };
@@ -873,6 +874,7 @@
                MTL_ENABLE_DEBUG_INFO = NO;
                PRODUCT_NAME = RealmTasks;
                SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+               SWIFT_VERSION = 3.0;
                VALIDATE_PRODUCT = YES;
            };
            name = Release;
@@ -890,7 +892,7 @@
                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
                PRODUCT_BUNDLE_IDENTIFIER = io.realm.realmtasks.ios;
                SDKROOT = iphoneos;
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
                TARGETED_DEVICE_FAMILY = "1,2";
            };
            name = Debug;
@@ -908,7 +910,7 @@
                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
                PRODUCT_BUNDLE_IDENTIFIER = io.realm.realmtasks.ios;
                SDKROOT = iphoneos;
-               SWIFT_VERSION = 3.0.1;
+               SWIFT_VERSION = 3.0;
                TARGETED_DEVICE_FAMILY = "1,2";
            };
            name = Release;
TimOliver commented 7 years ago

Thanks for the PR! I just finished updating #357 to the latest version on master and addressed all of the feedback in that one. I think at this point, that one should be slightly further ahead than this one now.

Considering this PR was mainly just doing the same in terms of updating pods and the latest branch, shall I just copy and paste over any other improvements to #357?

ewerx commented 7 years ago

I didn't make any other improvements, just the merge and update. Feel free to close this PR.