diff --git a/app/build.gradle b/app/build.gradle index 1d66f27..23e9664 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,15 @@ apply plugin: 'com.android.application' +def getVersionName = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'describe', '--tags' + standardOutput = stdout + } + return stdout.toString().trim() +} + + android { compileSdkVersion 22 buildToolsVersion "22.0.1" @@ -9,7 +19,7 @@ android { minSdkVersion 15 targetSdkVersion 22 versionCode 12 - versionName "1.5.0" + versionName = getVersionName() } File keystoreFile = file('keystore.properties') diff --git a/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java b/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java index dd2480c..aa7e506 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AboutDialogFragment.java @@ -40,7 +40,7 @@ public class AboutDialogFragment versionName = null; } TextView version = (TextView) mainView.findViewById(R.id.app_version); - version.setText("v" + versionName); + version.setText(versionName); TextView about = (TextView)mainView.findViewById(R.id.about_desc); about.setText(Html.fromHtml(getString(R.string.about_desc))); @@ -60,4 +60,4 @@ public class AboutDialogFragment return builder.create(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java b/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java index efd6f25..9913cd0 100644 --- a/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/SettingsFragment.java @@ -118,7 +118,7 @@ public class SettingsFragment extends PreferenceFragment // About preference String nameAndVersion = getActivity().getString(R.string.app_name); try { - nameAndVersion += " v" + + nameAndVersion += " " + getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName; } catch (PackageManager.NameNotFoundException exc) { }