Merge branch 'release-1.2'

tomighty · Dec 16, 2016 · d6a1f28 · d6a1f28
2 parents b273b81 + efd9b58
commit d6a1f28
Show file tree

Hide file tree

Showing 30 changed files with 2,000 additions and 2,848 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ src/Pods
 src/Podfile.lock
 
 src/.idea
+.DS_Store
diff --git a/README.md b/README.md
@@ -39,5 +39,6 @@ Thank you to all the contributors to Tomighty OSX:
 * Luke Wong (@hausofwong)
 * Matthew Andersen (@mattandersen)
 * Devon Tucker (@dvntucker)
+* Misha Tavkhelidze (@mtavkhelidze)
 
 Please let us know if you feel your name is missing from this list (and feel free to update it with your PRs).
diff --git a/build/README.md b/build/README.md
@@ -5,7 +5,7 @@ from the command line.
 
 ## Running
 
-Simply run build.sh from the build directory. Build artifacts should appear in the `targer`
+Simply run build.sh from the build directory. Build artifacts should appear in the `target`
 directory. Existing build artifacts must be deleted before running again.
 
 ## Packaging

diff --git a/build/package.sh b/build/package.sh
@@ -3,7 +3,7 @@
 #Us the create-dmg project to create the DMG
 #git clone https://github.com/andreyvit/yoursway-create-dmg.git
 
-VERSION="1.1"
+VERSION="1.2"
 
 mkdir -p target/package
 cp -rf target/Tomighty.app target/package/

diff --git a/src/Podfile b/src/Podfile
@@ -1,6 +1,6 @@
 # no pods for main target yet
 
-target :TomightyTests, :exclusive => true do
+target :TomightyTests do
 	pod 'OCHamcrest', '~> 3.0'
 	pod 'OCMockito', '~> 1.0'
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ src/Pods
		src/Podfile.lock

		src/.idea
		.DS_Store