Merge branch 'master' of github.com:pietrocaselani/CouchTracker

pietrocaselani · Apr 30, 2019 · cc80659 · cc80659
2 parents a4c6e79 + 2217b78
commit cc80659
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 25 deletions.
diff --git a/CouchTracker.xcodeproj/project.pbxproj b/CouchTracker.xcodeproj/project.pbxproj
@@ -3760,11 +3760,11 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3799,11 +3799,11 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3904,11 +3904,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "CouchTrackerCore-iOS/Info.plist";
@@ -3943,11 +3943,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "CouchTrackerCore-iOS/Info.plist";
@@ -4291,11 +4291,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B5RPM7SE3L;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = CouchTrackerApp/Info.plist;
@@ -4333,11 +4333,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B5RPM7SE3L;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = CouchTrackerApp/Info.plist;
@@ -4372,11 +4372,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B5RPM7SE3L;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = CouchTrackerPersistence/Info.plist;
@@ -4412,11 +4412,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B5RPM7SE3L;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 19;
+				DYLIB_CURRENT_VERSION = 20;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = CouchTrackerPersistence/Info.plist;

diff --git a/CouchTracker/Info.plist b/CouchTracker/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/CouchTrackerApp/Info.plist b/CouchTrackerApp/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 </dict>
 </plist>
diff --git a/CouchTrackerCore-iOS/Info.plist b/CouchTrackerCore-iOS/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/CouchTrackerCore/Info.plist b/CouchTrackerCore/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Pietro Caselani. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/CouchTrackerCoreTests/Info.plist b/CouchTrackerCoreTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 </dict>
 </plist>
diff --git a/CouchTrackerPersistence/Info.plist b/CouchTrackerPersistence/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 </dict>
 </plist>
diff --git a/TMDBTestsResources/Info.plist b/TMDBTestsResources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Pietro Caselani. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/TVDBTestsResources/Info.plist b/TVDBTestsResources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Pietro Caselani. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/TraktTestsResources/Info.plist b/TraktTestsResources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Pietro Caselani. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+# 0.0.1 (20) 
+* Add CircleCI badge [view commit](http://github.com/pietrocaselani/CouchTracker/commit/745f567e811b0df19cb4a38dd25662a109a5395d)
+* Don't run PR pipeline on master branch [view commit](http://github.com/pietrocaselani/CouchTracker/commit/2f99468b0b80f55b37ac63b51880924c97ad0b8c)
+* Sets build number to 19 [view commit](http://github.com/pietrocaselani/CouchTracker/commit/16da3e69378cf50f4c45d1966f1453e2efcb603a)
+* Merge branch 'master' of github.com:pietrocaselani/CouchTracker [view commit](http://github.com/pietrocaselani/CouchTracker/commit/d2316b56887b9643270a2fef3d160b1aa2bd1d32)
+* Bump build 18 [ci skip] [view commit](http://github.com/pietrocaselani/CouchTracker/commit/cfb1f39543ea3a7de0a6b611be47fbf6dfc0037d)
+
 # 0.0.1 (18)
 * Bump everything to 0.0.1 (17) [view commit](http://github.com/pietrocaselani/CouchTracker/commit/f0317042aa57b58f85e3386518151af747ec824f)
 * Merge branch 'master' of github.com:pietrocaselani/CouchTracker [view commit](http://github.com/pietrocaselani/CouchTracker/commit/96087465eadfb5a3ae0b1b8a411b061aa2a860a8)