Merge pull request #54 from BobDeKort/develop

Removed warning app icons
Hamster-Wheel-io · Apr 9, 2018 · 7ff4cef · 7ff4cef
2 parents fe92229 + 1f58ec6
commit 7ff4cef
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/HamsterWheel.xcodeproj/project.pbxproj b/HamsterWheel.xcodeproj/project.pbxproj
@@ -314,7 +314,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Bob De Kort";
 				TargetAttributes = {
 					C4B297B22016CDD1009FCA9F = {
@@ -489,13 +489,15 @@
 				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_DOCUMENTATION_COMMENTS = YES;
 				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;
@@ -546,13 +548,15 @@
 				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_DOCUMENTATION_COMMENTS = YES;
 				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;

diff --git a/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Contents.json b/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -67,9 +67,8 @@
       "scale" : "1x"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-Small@2x-1.png",
+      "size" : "29x29",
       "scale" : "2x"
     },
     {
@@ -79,9 +78,8 @@
       "scale" : "1x"
     },
     {
-      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-Small@2x-2.png",
+      "size" : "40x40",
       "scale" : "2x"
     },
     {

diff --git a/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
diff --git a/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-2.png b/HamsterWheel/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-2.png
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/SwiftyDraw/Source/SwiftyDraw.swift b/Pods/SwiftyDraw/Source/SwiftyDraw.swift
diff --git a/Pods/TTFortuneWheel/TTFortuneWheel/Utils.swift b/Pods/TTFortuneWheel/TTFortuneWheel/Utils.swift