merge refactor IOS-1511
authorAlejandro Gelos <agp@pep.security>
Wed, 08 May 2019 16:07:17 +0200
branchIOS-1511
changeset 8538acb491f0ecb9
parent 8537 9f4a44339f80
child 8540 3171d34c3c5c
merge refactor
subModules/pEpIOSToolbox/pEpIOSToolbox.xcodeproj/project.pbxproj
     1.1 --- a/subModules/pEpIOSToolbox/pEpIOSToolbox.xcodeproj/project.pbxproj	Wed May 08 15:32:47 2019 +0200
     1.2 +++ b/subModules/pEpIOSToolbox/pEpIOSToolbox.xcodeproj/project.pbxproj	Wed May 08 16:07:17 2019 +0200
     1.3 @@ -15,7 +15,6 @@
     1.4  		37904569223FA52B006DAB3B /* NetworkReachibilityMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37904567223FA52B006DAB3B /* NetworkReachibilityMock.swift */; };
     1.5  		3790456A223FA52B006DAB3B /* ReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37904568223FA52B006DAB3B /* ReachabilityTests.swift */; };
     1.6  		37954C6E227C90C10099B8D8 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37954C6D227C90C10099B8D8 /* Log.swift */; };
     1.7 -		435F5129221FF9D7006EB11F /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435F5128221FF9D7006EB11F /* Constants.swift */; };
     1.8  		B70A3A5522005BD400EDCE61 /* Date+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A3A5422005BD400EDCE61 /* Date+Extension.swift */; };
     1.9  		B70A3A5722005BE300EDCE61 /* NSRegularExpression+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A3A5622005BE300EDCE61 /* NSRegularExpression+Extension.swift */; };
    1.10  		B70A3A7322006B9F00EDCE61 /* SystemUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A3A7222006B9E00EDCE61 /* SystemUtils.swift */; };
    1.11 @@ -64,7 +63,6 @@
    1.12  		37904567223FA52B006DAB3B /* NetworkReachibilityMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkReachibilityMock.swift; sourceTree = "<group>"; };
    1.13  		37904568223FA52B006DAB3B /* ReachabilityTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReachabilityTests.swift; sourceTree = "<group>"; };
    1.14  		37954C6D227C90C10099B8D8 /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
    1.15 -		435F5128221FF9D7006EB11F /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Constants.swift; path = ../../../../Submodules/pEpIOSToolbox/pEpIOSToolbox/Other/Constants.swift; sourceTree = "<group>"; };
    1.16  		B70A3A5422005BD400EDCE61 /* Date+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
    1.17  		B70A3A5622005BE300EDCE61 /* NSRegularExpression+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSRegularExpression+Extension.swift"; sourceTree = "<group>"; };
    1.18  		B70A3A7222006B9E00EDCE61 /* SystemUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemUtils.swift; sourceTree = "<group>"; };
    1.19 @@ -260,7 +258,6 @@
    1.20  				B7A46C4F220C1F0C0027CCB5 /* MiscUtil.swift */,
    1.21  				B7DB7F512213120B003968DA /* SortedSet.swift */,
    1.22  				B70A3A7222006B9E00EDCE61 /* SystemUtils.swift */,
    1.23 -				435F5128221FF9D7006EB11F /* Constants.swift */,
    1.24  			);
    1.25  			path = Other;
    1.26  			sourceTree = "<group>";
    1.27 @@ -385,7 +382,6 @@
    1.28  				B7465DE72211E969008A1708 /* CGRect+Util.swift in Sources */,
    1.29  				B7465DCC2211BEEA008A1708 /* Tuple.swift in Sources */,
    1.30  				37904562223FA486006DAB3B /* NetworkReachabilityProtocol.swift in Sources */,
    1.31 -				435F5129221FF9D7006EB11F /* Constants.swift in Sources */,
    1.32  				B7A46C50220C1F0C0027CCB5 /* MiscUtil.swift in Sources */,
    1.33  				B70A3A7322006B9F00EDCE61 /* SystemUtils.swift in Sources */,
    1.34  				B7936E3D220DD8F5003B39E6 /* NSAttributedString+Extensions.swift in Sources */,