Merge pull request #1029 from mfietz/version_code_schema

Proposal for new version code schema
This commit is contained in:
Tom Hennen 2015-07-20 06:09:30 -04:00
commit 71bd2a1d74
3 changed files with 11 additions and 6 deletions

View File

@ -121,8 +121,7 @@ task filterAbout {
from 'src/main/templates/about.html' from 'src/main/templates/about.html'
into 'src/main/assets' into 'src/main/assets'
filter(ReplaceTokens, tokens: [versionname: android.defaultConfig.versionName, filter(ReplaceTokens, tokens: [versionname: android.defaultConfig.versionName,
versioncode: android.defaultConfig.versionCode.toString(), commit: "git rev-parse --short HEAD".execute().text])
commit: "git describe".execute().text])
} }
} }

View File

@ -1,8 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.danoeh.antennapod" package="de.danoeh.antennapod"
android:versionCode="61" android:versionCode="1030001"
android:versionName="1.3"> android:versionName="1.3-RC1">
<!--
Version code schema:
"1.2.3-SNAPSHOT" -> 1020300
"1.2.3-RC4" -> 1020304
"1.2.3[-RELEASE] -> 1020399
-->
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

View File

@ -41,8 +41,8 @@
<div id="header" align="center"> <div id="header" align="center">
<img src="logo.png" alt="Logo" width="100px" height="100px"/> <img src="logo.png" alt="Logo" width="100px" height="100px"/>
<p>AntennaPod, Version @versionname@, Build @versioncode@</p> <p>AntennaPod, Version @versionname@</p>
<p>commit: @commit@</p> <p>Commit: @commit@</p>
<p>Created by Daniel Oeh</p> <p>Created by Daniel Oeh</p>