Last cleanup and fixes

ValiantCat · Aug 4, 2015 · 723f981 · 723f981
1 parent ac1533e
commit 723f981
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/R.swift/values.swift b/R.swift/values.swift
@@ -20,7 +20,7 @@ let Imports = "\n".join([
 
 let ReuseIdentifier = Struct(
   type: Type(name: "ReuseIdentifier", genericType: Type(name: "T")),
-  implements: [Type(name: "Printable")],
+  implements: [Type(name: "CustomStringConvertible")],
   lets: [
     Let(
       name: "identifier",

diff --git a/ResourceApp/ResourceApp.xcodeproj/project.pbxproj b/ResourceApp/ResourceApp.xcodeproj/project.pbxproj
@@ -245,7 +245,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#\"$SRCROOT/rswift\" \"$SRCROOT\" > ./rswift.log";
+			shellScript = "\"$SRCROOT/rswift\" \"$SRCROOT\" > ./rswift.log";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/ResourceApp/ResourceApp/Images.xcassets/AppIcon.appiconset/Contents.json b/ResourceApp/ResourceApp/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,16 +1,31 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
       "scale" : "3x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
     {
       "size" : "40x40",
       "idiom" : "iphone",
       "filename" : "AppIcon.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
     {
       "idiom" : "iphone",
       "size" : "60x60",

diff --git a/ResourceApp/ResourceAppTests/ImagesTests.swift b/ResourceApp/ResourceAppTests/ImagesTests.swift
@@ -13,7 +13,6 @@ import XCTest
 class ImagesTests: XCTestCase {
 
   func testNoNilImages() {
-    XCTAssertNil(R.image.appIcon) // AppIcon is not available with "imageNamed"
     XCTAssertNotNil(R.image.eerste)
     XCTAssertNotNil(R.image.first)
     XCTAssertNotNil(R.image.firstNested)