Merge pull request #28 from JoniVR/master

Made delegate and datasource weak
zhuorantan · Jul 9, 2017 · 8df3408 · 8df3408
2 parents 8b9faa9 + 39e8489
commit 8df3408
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/LocationPicker.xcodeproj/project.pbxproj b/LocationPicker.xcodeproj/project.pbxproj
@@ -109,7 +109,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Jerome Tan";
 				TargetAttributes = {
 					022888761CA9398D00D7E11A = {
@@ -177,8 +177,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -226,8 +228,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -259,6 +263,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -281,6 +286,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

diff --git a/LocationPicker.xcodeproj/xcshareddata/xcschemes/LocationPicker.xcscheme b/LocationPicker.xcodeproj/xcshareddata/xcschemes/LocationPicker.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/LocationPicker/LocationPicker.swift b/LocationPicker/LocationPicker.swift
@@ -163,13 +163,13 @@ open class LocationPicker: UIViewController, UIGestureRecognizerDelegate {
     open var locationDeniedHandler: ((LocationPicker) -> Void)?
 
 
-    // MARK: Optional varaiables
+    // MARK: Optional variables
 
     /// Delegate of `protocol LocationPickerDelegate`
-    open var delegate: LocationPickerDelegate?
+    open weak var delegate: LocationPickerDelegate?
 
     /// DataSource of `protocol LocationPickerDataSource`
-    open var dataSource: LocationPickerDataSource?
+    open weak var dataSource: LocationPickerDataSource?
 
     /**
      Locations that show in the location list.

diff --git a/...ickerDemo/LocationPickerDemo.xcodeproj/xcshareddata/xcschemes/LocationPickerDemo.xcscheme b/...ickerDemo/LocationPickerDemo.xcodeproj/xcshareddata/xcschemes/LocationPickerDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"