Make code changes for Swift 5.0

okhanokbay · Dec 7, 2019 · 88f6c75 · 88f6c75
1 parent 108a79b
commit 88f6c75
Show file tree

Hide file tree

Showing 92 changed files with 10,490 additions and 6,453 deletions.
diff --git a/Example/MapViewPlus.xcodeproj/project.pbxproj b/Example/MapViewPlus.xcodeproj/project.pbxproj
@@ -200,7 +200,6 @@
  607FACCD1AFB9204008FA782 /* Frameworks */,
  607FACCE1AFB9204008FA782 /* Resources */,
  788AC9CE4B9866EFD18E4D7D /* [CP] Embed Pods Frameworks */,
- FCD98EB814075795A1CBC26D /* [CP] Copy Pods Resources */,
  );
  buildRules = (
  );
@@ -218,7 +217,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 1120;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
@@ -290,7 +289,7 @@
  files = (
  );
  inputPaths = (
- "${SRCROOT}/Pods/Target Support Files/Pods-MapViewPlus_Example/Pods-MapViewPlus_Example-frameworks.sh",
+ "${PODS_ROOT}/Target Support Files/Pods-MapViewPlus_Example/Pods-MapViewPlus_Example-frameworks.sh",
  "${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
  "${BUILT_PRODUCTS_DIR}/MapViewPlus/MapViewPlus.framework",
  );
@@ -301,22 +300,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MapViewPlus_Example/Pods-MapViewPlus_Example-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
- FCD98EB814075795A1CBC26D /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MapViewPlus_Example/Pods-MapViewPlus_Example-resources.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MapViewPlus_Example/Pods-MapViewPlus_Example-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
 /* End PBXShellScriptBuildPhase section */
@@ -341,6 +325,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -349,12 +334,14 @@
  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;
@@ -382,7 +369,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
@@ -394,6 +381,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -402,12 +390,14 @@
  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;
@@ -428,7 +418,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/Example/MapViewPlus.xcodeproj/xcshareddata/xcschemes/MapViewPlus-Example.xcscheme b/Example/MapViewPlus.xcodeproj/xcshareddata/xcschemes/MapViewPlus-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0900"
+ LastUpgradeVersion = "1120"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -40,8 +40,16 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+ BuildableName = "MapViewPlus_Example.app"
+ BlueprintName = "MapViewPlus_Example"
+ ReferencedContainer = "container:MapViewPlus.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
  <Testables>
  <TestableReference
  skipped = "NO">
@@ -54,23 +62,11 @@
  </BuildableReference>
  </TestableReference>
  </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "MapViewPlus_Example.app"
- BlueprintName = "MapViewPlus_Example"
- ReferencedContainer = "container:MapViewPlus.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
  </TestAction>
  <LaunchAction
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
  ReferencedContainer = "container:MapViewPlus.xcodeproj">
  </BuildableReference>
  </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
  </LaunchAction>
  <ProfileAction
  buildConfiguration = "Release"

diff --git a/Example/MapViewPlus.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/MapViewPlus.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,19 +1,23 @@
 PODS:
- - Kingfisher (4.6.3)
- - MapViewPlus (0.1.0):
- - Kingfisher (~> 4.6.3)
+ - Kingfisher (5.6.0)
+ - MapViewPlus (0.1.3):
+ - Kingfisher (~> 5.6.0)
 
 DEPENDENCIES:
  - MapViewPlus (from `../`)
 
+SPEC REPOS:
+ https://github.com/cocoapods/specs.git:
+ - Kingfisher
+
 EXTERNAL SOURCES:
  MapViewPlus:
- :path: ../
+ :path: "../"
 
 SPEC CHECKSUMS:
- Kingfisher: 98e6d5b5e807645743e8ed5ececd25d688d38452
- MapViewPlus: d697bb1591521001bfaa42dd3d055892ac97e26a
+ Kingfisher: 1a50df6880a60bae26f3e21a0df3d17b892f5e0b
+ MapViewPlus: 92608071766d967ebad6316d226ba99e3e1dfcb3
 
-PODFILE CHECKSUM: b1a4f230a6b224ef6ae017c8175433228bad92f5
+PODFILE CHECKSUM: dfc6609628027e0bbaa342f25ad017707d275048
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.7.3
diff --git a/Example/Pods/Kingfisher/README.md b/Example/Pods/Kingfisher/README.md