Merge pull request #397 from dekusms/staging

Staging

Author: sherlockwisdom

.gitignore

@@ -10,6 +10,8 @@
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
+lib_smsmms_android/build
+lib_smsmms_android/build/*
 /captures
 .externalNativeBuild
 .cxx

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "reproducible-apk-tools"]
 	path = reproducible-apk-tools
 	url = https://github.com/obfusk/reproducible-apk-tools.git
+[submodule "smswithoutborders_libsmsmms"]
+	path = smswithoutborders_libsmsmms
+	url = [email protected]:smswithoutborders/lib_smsmms_android.git

.idea/misc.xml

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-	id "com.diffplug.spotless" version "6.20.0"
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
+	id "com.diffplug.spotless" version "7.0.4"
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0'
 
     id("com.gradleup.nmcp").version("0.0.8")
     alias(libs.plugins.compose.compiler)
@@ -40,13 +40,16 @@ android {
             }
         }
 
-        resourceConfigurations += ["en", "fr", "ru", "de", "pl"]
     }
 
     buildFeatures {
         compose true
     }
 
+    dexOptions {
+        incremental true
+    }
+
     buildscript {
         ext {
             compose_compiler = '1.3.1'         //compiler
@@ -95,16 +98,23 @@ android {
         jvmTarget = "1.8"
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        //If you want to continue even if errors found use following line
+
+    packaging {
+        resources {
+            it.excludes += "/META-INF/{LICENSE.md,NOTICE.md}"
+        }
+    }
+    lint {
         abortOnError false
+        checkReleaseBuilds false
     }
 
 }
 
 dependencies {
     implementation project(':smswithoutborders_libsignal-doubleratchet')
+//    implementation project(':smswithoutborders_libsmsmms:lib_smsmms_android')
+    implementation 'com.github.smswithoutborders:lib_smsmms_android:12cee57'
 
     implementation libs.androidx.room.testing
     implementation libs.androidx.activity
@@ -266,7 +276,13 @@ dependencies {
 
     implementation libs.accompanist.permissions
 
-    implementation(platform(libs.androidx.compose.bom.v20250200))
+//    implementation(platform(libs.androidx.compose.bom.v20250200))
     implementation(libs.androidx.paging.compose)
-}
 
+    implementation(libs.android.smsmms)
+//    compile libs.android.smsmms
+
+    androidTestImplementation libs.androidx.rules
+
+    implementation(libs.coil.video)
+}

app/build.gradle

@@ -11,10 +11,27 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 49,
-      "versionName": "0.37.0",
+      "versionCode": 67,
+      "versionName": "0.61.0",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 24
 }