Merge pull request #242 from mcruncher/feature/WS-237-prepare-3.0

#237 Updated the version to 3.0.0

Podfile

@@ -1,13 +1,14 @@
+platform :ios, '9.0'
 use_frameworks!
 
 def common_pods
   pod 'FMDB'
-  pod 'YouTubePlayer', :git => 'https://github.com/gilesvangruisen/Swift-YouTube-Player.git', :tag => 'v0.5.0', :submodules => true
-  pod 'Floaty', :git => 'https://github.com/kciter/KCFloatingActionButton.git', :tag => '4.1.0', :submodules => true  
+  pod 'YouTubePlayer'
+  pod 'Floaty'
 end
 
 def test_pods
-  pod 'SwiftLint', '~> 0.42.0'  
+  pod 'SwiftLint'
 end
 
 target "worshipsongs" do
@@ -23,7 +24,7 @@ end
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '4.2'
+            config.build_settings['SWIFT_VERSION'] = '5.0'
         end
     end
 end

Podfile.lock

@@ -3,46 +3,28 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - SwiftLint (0.42.0)
-  - YouTubePlayer (0.5.0)
+  - SwiftLint (0.43.1)
+  - YouTubePlayer (0.7.2)
 
 DEPENDENCIES:
-  - Floaty (from `https://github.com/kciter/KCFloatingActionButton.git`, tag `4.1.0`)
+  - Floaty
   - FMDB
-  - SwiftLint (~> 0.42.0)
-  - YouTubePlayer (from `https://github.com/gilesvangruisen/Swift-YouTube-Player.git`, tag `v0.5.0`)
+  - SwiftLint
+  - YouTubePlayer
 
 SPEC REPOS:
   trunk:
+    - Floaty
     - FMDB
     - SwiftLint
-
-EXTERNAL SOURCES:
-  Floaty:
-    :git: https://github.com/kciter/KCFloatingActionButton.git
-    :submodules: true
-    :tag: 4.1.0
-  YouTubePlayer:
-    :git: https://github.com/gilesvangruisen/Swift-YouTube-Player.git
-    :submodules: true
-    :tag: v0.5.0
-
-CHECKOUT OPTIONS:
-  Floaty:
-    :git: https://github.com/kciter/KCFloatingActionButton.git
-    :submodules: true
-    :tag: 4.1.0
-  YouTubePlayer:
-    :git: https://github.com/gilesvangruisen/Swift-YouTube-Player.git
-    :submodules: true
-    :tag: v0.5.0
+    - YouTubePlayer
 
 SPEC CHECKSUMS:
   Floaty: 1a4e213f3512cf3045ef9cb0c1ff456226d1f66a
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d
-  YouTubePlayer: c9581f0405e3240d1549b194bc1134bfc018a51d
+  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
+  YouTubePlayer: 2b5f2830d8f9b2cde942083211291e382c9e6bd5
 
-PODFILE CHECKSUM: 4991f7756e3abf6fdf71297f90dca5eadda7e47e
+PODFILE CHECKSUM: 3716037c5bdd373db6ce39bd15f8bb05601b47ad
 
 COCOAPODS: 1.10.1

fastlane/Fastfile

@@ -24,6 +24,22 @@ platform :ios do
     clear_derived_data
   end
 
+  ##### Development ######
+  desc "Automatically bumps the major version"
+  lane :bump_major_version do
+    increment_version_number(bump_type: "major")
+  end
+
+  desc "Automatically bumps minor version"
+  lane :bump_minor_version do
+    increment_version_number(bump_type: "minor")
+  end
+
+  desc "Automatically bumps the patch version"
+  lane :bump_patch_version do
+    increment_version_number(bump_type: "patch")
+  end
+
   ##### Tests ######
   desc "Runs Unit Tests"
   lane :unit_tests do

worshipsongs.xcodeproj/project.pbxproj

@@ -489,6 +489,7 @@
 						CreatedOnToolsVersion = 7.0.1;
 						DevelopmentTeam = 7W474V4EGY;
 						LastSwiftMigration = 0900;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
 								enabled = 1;
@@ -876,9 +877,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = worshipsongs/worshipsongs.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 7W474V4EGY;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = worshipsongs/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -905,6 +908,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 7W474V4EGY;
 				INFOPLIST_FILE = worshipsongs/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

worshipsongs.xcodeproj/xcshareddata/IDETemplateMacros.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>FILEHEADER</key>
+<string>
+// Author: ___FULLUSERNAME___
+// Since: YOUR_VERSION
+// Copyright © ___YEAR___ mCruncher. All rights reserved.
+// </string>
+</dict>
+</plist>

worshipsongs/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

worshipsongsTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.1</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

worshipsongsUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.1</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>