Merge pull request #216 from deku-messaging/staging

Staging

.gitignore

@@ -21,3 +21,4 @@ keystore.properties
 ks.passwd
 venv/*
 /release.properties
+*.sw*

Makefile

@@ -71,10 +71,6 @@ check:
 		echo "+ [NOT FOUND] ${RELEASE_VERSION_PYTHON_FILENAME}"; \
 		echo ">> This file releases the build on the various distribution outlets"; \
 	fi
-	@if [ ! -f ${KEYSTORE_PASSWD} ]; then \
-		echo "+ [NOT FOUND] ${KEYSTORE_PASSWD}"; \
-		echo ">> This file contains the password for the keystore"; \
-	fi
 
 info: check
 	@echo "- Branch name: ${branch}"

app/build.gradle

@@ -49,25 +49,27 @@ android {
 //        generateLocaleConfig true
 //    }
     sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+
         main {
             jniLibs.srcDirs = ['libs']
             java {
                 exclude 'com/afkanerd/deku/Images/Images/'
                 /* The holder name I want to excludes its all classes */
             }
+            resources {
+                srcDirs 'src/main/resources'
+            }
         }
     }
 
     buildTypes {
         release {
             minifyEnabled false
+//            minifyEnabled true
+//            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-
-        nightly {
-            versionNameSuffix "-nightly"
-            debuggable true
-        }
     }
 
     compileOptions {
@@ -124,6 +126,7 @@ android {
 
 dependencies {
     implementation project(':smswithoutborders_libsignal-doubleratchet')
+    implementation 'androidx.room:room-testing:2.6.1'
     def paging_version = "3.2.1"
 
     testImplementation 'junit:junit:4.13.2'

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 37,
-      "versionName": "0.25.0",
+      "versionCode": 49,
+      "versionName": "0.37.0",
       "outputFile": "app-release.apk"
     }
   ],