Merge branch '1.2-development'

* 1.2-development: Move everything to specific folders Rename Gif to UIImage+Gif Bump version Add CONTRIBUTING.md, unset source in tests Bump version
swiftgif · Jun 16, 2014 · 2fbb73f · 2fbb73f
2 parents 057a25d + ff74a55
commit 2fbb73f
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 125 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contributing
+You want to contribute? Thank you :smila:
+
+1. Clone the repositoy: `git clone git@github.com:bahlo/SwiftGif.git`
+2. Create a new branch with the schema `my-feature`.
+3. Implement your feature
+4. Open a pull request
+
+:heart:
+
diff --git a/SwiftGif.xcodeproj/project.pbxproj b/SwiftGif.xcodeproj/project.pbxproj
diff --git a/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcschemes/SwiftGif.xcscheme b/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcschemes/SwiftGif.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1448EB6A19491D2000D54654"
+               BlueprintIdentifier = "14A76437194EFBB800A74B1F"
                BuildableName = "SwiftGif.app"
                BlueprintName = "SwiftGif"
                ReferencedContainer = "container:SwiftGif.xcodeproj">
@@ -32,7 +32,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1448EB7719491D2100D54654"
+               BlueprintIdentifier = "14A76444194EFBB800A74B1F"
                BuildableName = "SwiftGifTests.xctest"
                BlueprintName = "SwiftGifTests"
                ReferencedContainer = "container:SwiftGif.xcodeproj">
@@ -42,7 +42,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1448EB6A19491D2000D54654"
+            BlueprintIdentifier = "14A76437194EFBB800A74B1F"
             BuildableName = "SwiftGif.app"
             BlueprintName = "SwiftGif"
             ReferencedContainer = "container:SwiftGif.xcodeproj">
@@ -61,7 +61,7 @@
       <BuildableProductRunnable>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1448EB6A19491D2000D54654"
+            BlueprintIdentifier = "14A76437194EFBB800A74B1F"
             BuildableName = "SwiftGif.app"
             BlueprintName = "SwiftGif"
             ReferencedContainer = "container:SwiftGif.xcodeproj">
@@ -79,7 +79,7 @@
       <BuildableProductRunnable>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1448EB6A19491D2000D54654"
+            BlueprintIdentifier = "14A76437194EFBB800A74B1F"
             BuildableName = "SwiftGif.app"
             BlueprintName = "SwiftGif"
             ReferencedContainer = "container:SwiftGif.xcodeproj">

diff --git a/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcschemes/xcschememanagement.plist b/SwiftGif.xcodeproj/xcuserdata/arne.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
-		<key>1448EB6A19491D2000D54654</key>
+		<key>14A76437194EFBB800A74B1F</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
-		<key>1448EB7719491D2100D54654</key>
+		<key>14A76444194EFBB800A74B1F</key>
 		<dict>
 			<key>primary</key>
 			<true/>

diff --git a/SwiftGif/Gif.swift → SwiftGifCommon/UIImage+Gif.swift b/SwiftGif/Gif.swift → SwiftGifCommon/UIImage+Gif.swift
diff --git a/SwiftGif/AppDelegate.swift → SwiftGifDemo/AppDelegate.swift b/SwiftGif/AppDelegate.swift → SwiftGifDemo/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json b/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
diff --git a/SwiftGif/Info.plist → SwiftGifDemo/Info.plist b/SwiftGif/Info.plist → SwiftGifDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/SwiftGif/RootViewController.swift → SwiftGifDemo/RootViewController.swift b/SwiftGif/RootViewController.swift → SwiftGifDemo/RootViewController.swift
diff --git a/SwiftGif/adventure-time.gif → SwiftGifDemo/adventure-time.gif b/SwiftGif/adventure-time.gif → SwiftGifDemo/adventure-time.gif
diff --git a/SwiftGif/jeremy.gif → SwiftGifDemo/jeremy.gif b/SwiftGif/jeremy.gif → SwiftGifDemo/jeremy.gif
diff --git a/SwiftGifTests/GifTests.swift b/SwiftGifTests/GifTests.swift
@@ -26,6 +26,7 @@ class GifTests: XCTestCase {
 
     override func tearDown() {
         imageData = nil
+        source = nil
 
         super.tearDown()
     }