Merge pull request #35 from RowlandOti/release/2024/07/12-1

Release/2024/07/12 1
RowlandOti · Jul 16, 2024 · 01fedad · 01fedad
2 parents 71c3091 + 3aef62c
commit 01fedad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.buildsystem/versioning.gradle b/.buildsystem/versioning.gradle
@@ -9,7 +9,12 @@
 
 ext.getVersionCode = { ->
     try {
-        return 2
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'rev-list', '--all', '--count'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim().toInteger()
     }
     catch (ignored) {
         return -1;

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -211,7 +211,8 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  x64-mingw-ucrt
+  universal-darwin-23
+  x64-unknown
   x86_64-darwin-17
 
 DEPENDENCIES

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
@@ -2,11 +2,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.rowland.delivery.merchant">
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 
     <application
         android:name=".MerchantApplication"