updated build.info creating with gradle

This commit is contained in:
Peter Siegmund committed 2016-05-02 10:01:29 +02:00
1 parent 625b00cbde
commit cacad93c6f
6 files changed
+18 -7

No files matched your search

+1
View File
@@ -1,3 +1,4 @@
com.sap.sailing.android.tracking.app.test-test/bin/
/target
build.info
assets_gen
@@ -76,13 +76,21 @@ public class AppUtils {
/**
* Read the build.info from the asset folder, which is written at build time with git information
*
* @return content of the build.info file or an empty string, if no file was found
* @return content of the build.info (or build_gradle.info) file or an empty string, if no file was found
*/
public String getBuildInfo() {
String buildInfo = "";
BufferedReader reader = null;
try {
reader = new BufferedReader(new InputStreamReader(mContext.getAssets().open("build.info")));
String file = "build.info";
String[] files = mContext.getAssets().list("");
for (String item : files) {
if ("build_gradle.info".equals(item)) {
file = item;
break;
}
}
reader = new BufferedReader(new InputStreamReader(mContext.getAssets().open(file)));
buildInfo = reader.readLine();
} catch (IOException e) {
Log.d(TAG, "Can't open file with build info", e);
@@ -23,7 +23,7 @@ android {
manifest.srcFile "AndroidManifest.xml"
java.srcDirs = ["src"]
res.srcDirs = ["res"]
assets.srcDirs = ["assets"]
assets.srcDirs = ["assets", "assets_gen"]
}
androidTest {
@@ -23,7 +23,7 @@ android {
manifest.srcFile "AndroidManifest.xml"
java.srcDirs = ["src"]
res.srcDirs = ["res"]
assets.srcDirs = ["assets"]
assets.srcDirs = ["assets", "assets_gen"]
}
androidTest {
@@ -26,7 +26,7 @@ android {
manifest.srcFile "AndroidManifest.xml"
java.srcDirs = ["src"]
res.srcDirs = ["res"]
assets.srcDirs = ["assets"]
assets.srcDirs = ["assets", "assets_gen"]
}
androidTest {
+4 -2
View File
@@ -42,7 +42,9 @@ preBuild.doLast {
// save the combined build info into assets/build.info file
def result_line = git_branch_or_tag + "-" + git_version + " (" +
build_time + ")\n"
def assetsDir = android.sourceSets.main.assets.srcDirs.toArray()[0]
def buildInfoFile = new File(assetsDir, 'build.info').getAbsolutePath()
def assetsDir = android.sourceSets.main.assets.srcDirs.toArray()[1]
delete(assetsDir)
mkdir(assetsDir)
def buildInfoFile = new File(assetsDir, 'build_gradle.info').getAbsolutePath()
new File(buildInfoFile).write(result_line)
}