bump version to v2.1.2 (#638)

* bump version to v2.1.2

* embed current build number in beta version codes

Author: hawkrives

android/app/build.gradle

@@ -96,7 +96,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
-        versionName "2.1.1"
+        versionName "2.1.2"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

fastlane/Fastfile

@@ -50,10 +50,10 @@ platform :ios do
 
     go_rogue
 
-    increment_build_number(
-      build_number: get_version(platform: 'iOS'),
-      xcodeproj: "./ios/AllAboutOlaf.xcodeproj",
-    )
+    version = get_current_bundle_version(platform: "iOS")
+    build_number = get_build_number(platform: "iOS")
+    increment_version_number(version_number: "#{version}.#{build_number}", xcodeproj: "./ios/AllAboutOlaf.xcodeproj")
+    increment_build_number(build_number: build_number, xcodeproj: "./ios/AllAboutOlaf.xcodeproj")
 
     # Build the app
     gym
@@ -143,10 +143,11 @@ end
 platform :android do
   desc "Makes a build"
   lane :build do
-    set_version_code(
-      version_code: get_version(platform: "Android"),
-      gradle_path: "./android/app/build.gradle",
-    )
+    version = get_current_bundle_version(platform: "Android")
+    build_number = get_build_number(platform: "Android")
+
+    set_version_name(version_name: "#{version}.#{build_number}", gradle_path: "android/app/build.gradle")
+    set_version_code(version_code: build_number, gradle_path: "./android/app/build.gradle")
 
     gradle(
       task: "assemble",
@@ -220,7 +221,7 @@ private_lane :get_hockeyapp_version_commit do |options|
 end
 
 desc "Gets the version, either from Travis or from Hockey"
-private_lane :get_version do |options|
+private_lane :get_build_number do |options|
   ENV["TRAVIS_BUILD_NUMBER"] || get_hockeyapp_version(platform: options[:platform]) + 1
 end
 
@@ -230,3 +231,11 @@ private_lane :build_notes do |options|
   changelog = make_changelog(platform: options[:platform])
   "branch: #{branch}\ngit commit: #{sha}\n\n## Changelog\n#{changelog}"
 end
+
+private_lane :get_current_bundle_version do |options|
+  if options[:platform] == 'Android'
+    get_version_name(gradle_path: "android/app/build.gradle")
+  elsif options[:platform] == 'iOS'
+    get_info_plist_value(path: "ios/AllAboutOlaf/Info.plist", key: "CFBundleShortVersionString")
+  end
+end

fastlane/actions/get_version_name.rb

@@ -0,0 +1,46 @@
+module Fastlane
+  module Actions
+    class GetVersionNameAction < Action
+      def self.run(params)
+        gradle_path = params[:gradle_path]
+        version_name = nil
+
+        File.foreach(gradle_path) do |line|
+          if line.include? "versionName "
+            components = line.strip.split(" ")
+            version_name = components[1].tr("\"","")
+          end
+        end
+
+        if version_name == nil
+          UI.user_error!("Impossible to find the version name in the current gradle file #{gradle_path}")
+        else
+          UI.success("Version name found: #{version_name}")
+        end
+
+        version_name
+      end
+
+      def self.description
+        "Get the version name of your android project."
+      end
+
+      def self.authors
+        ["Hawken Rives"]
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :gradle_path,
+                                  env_name: "GETVERSIONNAME_GRADLE_PATH",
+                               description: "The path to the build.gradle file",
+                                      type: String),
+        ]
+      end
+
+      def self.is_supported?(platform)
+        [:android].include?(platform)
+      end
+    end
+  end
+end

ios/All About Olaf UI Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>2.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

ios/AllAboutOlaf/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>2.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/AllAboutOlafTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "AllAboutOlaf",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",