diff --git a/Example/Example iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Example iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index 118c98f..b8236c6 100644 --- a/Example/Example iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/Example iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", diff --git a/Example/Example iOS/Assets.xcassets/Contents.json b/Example/Example iOS/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Example/Example iOS/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Contents.json b/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Contents.json new file mode 100644 index 0000000..57ca428 --- /dev/null +++ b/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Logo.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Logo.png b/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Logo.png new file mode 100644 index 0000000..d6889b3 Binary files /dev/null and b/Example/Example iOS/Assets.xcassets/ic_logo.imageset/Logo.png differ diff --git a/Example/Example iOS/Base.lproj/LaunchScreen.storyboard b/Example/Example iOS/Base.lproj/LaunchScreen.storyboard index 323bd43..6fdd274 100644 --- a/Example/Example iOS/Base.lproj/LaunchScreen.storyboard +++ b/Example/Example iOS/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -14,14 +15,29 @@ - + - + + + + + + + + + + + + + - + + + + diff --git a/Example/Example iOS/Base.lproj/Main.storyboard b/Example/Example iOS/Base.lproj/Main.storyboard index 78f2f57..d7ed5a2 100644 --- a/Example/Example iOS/Base.lproj/Main.storyboard +++ b/Example/Example iOS/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -14,11 +15,10 @@ - + - @@ -27,7 +27,6 @@ - @@ -36,23 +35,21 @@ - - + - + @@ -79,14 +76,12 @@ - + - + - + @@ -111,22 +106,22 @@ - + - + - + - + @@ -156,9 +151,9 @@ - + - + @@ -167,17 +162,14 @@ - + - - - + - diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 595be45..aa7fb8a 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -292,7 +292,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; B2EA9311BFC6F98696DCF43F /* [CP] Check Pods Manifest.lock */ = { @@ -307,7 +307,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; BE397A7E64678C9CCD379BF7 /* [CP] Embed Pods Frameworks */ = { @@ -489,7 +489,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 103C458DB709116CF3A71CAA /* Pods-Example iOS.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = "Example iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -497,7 +496,6 @@ PRODUCT_BUNDLE_IDENTIFIER = de.mathiaskoehnke.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Example-Bridging-Header.h"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -505,7 +503,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 8B4DABDA781BE033312A356A /* Pods-Example iOS.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = "Example iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -513,7 +510,6 @@ PRODUCT_BUNDLE_IDENTIFIER = de.mathiaskoehnke.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Example-Bridging-Header.h"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -521,7 +517,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6611650B8D155042CC566BB5 /* Pods-Example OSX.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -531,7 +526,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "de.mathiaskoehnke.Example-OSX"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -539,7 +533,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = E524A5A77547899C72AB259A /* Pods-Example OSX.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -549,7 +542,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "de.mathiaskoehnke.Example-OSX"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 9f42adb..3627944 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,6 +1,6 @@ PODS: - hpple (0.2.0) - - WKZombie (0.9.5): + - WKZombie (1.0.0.rc.1): - hpple (= 0.2.0) DEPENDENCIES: @@ -12,8 +12,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: hpple: 3b765f96fc2cd56ad1a49aef6f7be5cb2aa64b57 - WKZombie: b6192e2e334ec68e3069ed5622d369f72ea43d09 + WKZombie: ec37a111c9a6be353a7cdacd8db0914992127128 PODFILE CHECKSUM: d530690e373e4c270897769971faa34622df5672 -COCOAPODS: 1.0.1 +COCOAPODS: 1.1.0.rc.1