Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

update build and manifest

n8fr863662dabd67d
diff --git a/build.gradle b/build.gradle
index e5daafd..77b43a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ repositories {
allprojects {
project.ext {
// these are common variables used in */build.gradle
- version_number="0.0.17"
+ version_number="0.0.18"
group_info="haven"
signal_version="2.3.0"
buildToolsVersion="26.0.2"
@@ -57,6 +57,9 @@ android {
defaultConfig {
applicationId "info.guardianproject.phoneypot"
+ versionCode 18
+ versionName getVersionName()
+ archivesBaseName = "Haven-$versionName"
minSdkVersion 16
targetSdkVersion 25
compileOptions {
@@ -110,3 +113,14 @@ dependencies {
}
}
+
+/* gets the version name from the latest Git tag, stripping the leading v off */
+def getVersionName = { ->
+ def stdout = new ByteArrayOutputStream()
+ exec {
+ commandLine 'git', 'describe', '--tags', '--always', '--abbrev=0'
+ standardOutput = stdout
+ }
+ return stdout.toString().trim()
+}
+
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 1c14c88..b07a3cc 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="info.guardianproject.phoneypot"
- android:versionCode="17"
- android:versionName="0.0.17">
-
- <uses-sdk
- android:minSdkVersion="10"
- android:targetSdkVersion="25" />
+ package="info.guardianproject.phoneypot">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />