Merge branch 'release/1.1.0'

Author: gabrielrobert

android_handler.go

@@ -72,7 +72,7 @@ func applyVersionToAndroidXML(data []byte, newVersion string) []byte {
 
 		// edit versionCode attr
 		acmt, err = mxj.Map(vmap).ValueForPath("#attr.android:versionCode.#text")
-		acmt = strings.Replace(newVersion, ".", "", -1)
+		acmt = buildAndroidVersionCode(newVersion)
 		mxj.Map(vmap).SetValueForPath(acmt, "#attr.android:versionCode.#text")
 		err = m.SetValueForPath(vmap, "manifest")
 		check(err)

android_handler_test.go

@@ -59,8 +59,8 @@ func Test_applyVersionToAndroidXML(t *testing.T) {
 	if xml.VersionName != "1.0.2" {
 		t.Errorf("VersionName mismatch; expected %v", "1.0.2")
 	}
-	if xml.Code != "102" {
-		t.Errorf("code mismatch; expected %v", "102")
+	if xml.Code != "1000200" {
+		t.Errorf("code mismatch; actual %v, expected %v", xml.Code, "1000200")
 	}
 }
 

main.go

@@ -13,7 +13,7 @@ func main() {
 	app.Usage = "Command-line utility to automatically increase applications version"
 	app.Author = "Gabriel Robert"
 	app.Email = "[email protected]"
-	app.Version = "1.0.0"
+	app.Version = "1.1.0"
 	app.Commands = commands()
 
 	err := app.Run(os.Args)

readme.md

@@ -14,7 +14,7 @@ Command-line utility to automatically increase iOS / Android / UWP applications
 Using [Chocolatey](https://chocolatey.org/):
 
 ```bash
-$ choco install xavtool
+$ choco install xavtool -version 1.1.0
 $ xavtool --version
 ```
 
@@ -59,7 +59,7 @@ USAGE:
    xavtool [global options] command [command options] [arguments...]
 
 VERSION:
-   1.0.0
+   1.1.0
 
 AUTHOR:
    Gabriel Robert <[email protected]>

test/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.xavtool" android:versionCode="101" android:versionName="1.0.1">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.xavtool" android:versionCode="1000100" android:versionName="1.0.1">
   <permission android:name="android"/>
   <application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/Theme.Sample">
     <activity android:name="com.example.xavtool.MainActivity" android:label="@string/app_name" android:launchMode="singleTop">

version.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"fmt"
+	"strconv"
+
 	"github.com/Masterminds/semver"
 )
 
@@ -35,3 +38,17 @@ func isVersion(version string) bool {
 	}
 	return true
 }
+
+func buildAndroidVersionCode(version string) string {
+	parsedVersion := parse(version)
+
+	versionCode := parsedVersion.Major() * 1000000
+	versionCode += parsedVersion.Minor() * 10000
+	versionCode += parsedVersion.Patch() * 100
+
+	if versionCode > 2000000000 {
+		panic(fmt.Sprintf("Android versionCode cannot be greater than %v", 2000000000))
+	}
+
+	return strconv.FormatInt(versionCode, 10)
+}

version_test.go

@@ -92,3 +92,25 @@ func Test_isVersion(t *testing.T) {
 		})
 	}
 }
+
+func Test_buildAndroidVersionCode(t *testing.T) {
+	type args struct {
+		version string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{"1.99.1", args{"1.99.1"}, "1990100"},
+		{"2.0.0", args{"2.0.0"}, "2000000"},
+		{"0.0.0", args{"0.0.0"}, "0"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := buildAndroidVersionCode(tt.args.version); got != tt.want {
+				t.Errorf("buildAndroidVersionCode() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

xavtool.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>xavtool</id>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <title>xavtool</title>
     <authors>gabrielrobert</authors>
     <projectUrl>https://github.com/gabrielrobert/xavtool</projectUrl>