Merge pull request #431 from fieldsight/430-form-filter

project types and region null filter applied
fieldsight · Oct 31, 2019 · c43eb6b · c43eb6b
2 parents ae2b5ae + 9b2dd73
commit c43eb6b
Show file tree

Hide file tree

Showing 18 changed files with 1,766 additions and 87 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -78,7 +78,7 @@ def mapboxToken = secrets.getProperty('MAPBOX_ACCESS_TOKEN', getProps("mapbox"))
 
 def versionMajor = 3
 def versionMinor = 2
-def versionPatch = 5
+def versionPatch = 6
 
 android {
     compileSdkVersion(28)
@@ -90,7 +90,7 @@ android {
         //versionCode LEGACY_BUILD_NUMBER_OFFSET + getMasterCommitCount()
         //versionName getVersionName()
         versionCode versionMajor * 1000 + versionMinor * 100 + versionPatch
-        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}-beta"
         System.out.println(versionName + " " + versionCode)
         testInstrumentationRunner('android.support.test.runner.AndroidJUnitRunner')
         multiDexEnabled true

diff --git a/collect_app/release/output.json b/collect_app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3204,"versionName":"3.2.4-beta","enabled":true,"outputFile":"collect-release3.2.4-beta.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.4-beta.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3205,"versionName":"3.2.5","enabled":true,"outputFile":"collect-release3.2.5.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.5.apk","properties":{}}]