jbsession
diff --git a/‎.github/workflows/build_and_test.yml‎
Lines changed: 57 additions & 12 deletions b/‎.github/workflows/build_and_test.yml‎
Lines changed: 57 additions & 12 deletions
diff --git a/‎app/build.gradle.kts‎
Lines changed: 40 additions & 20 deletions b/‎app/build.gradle.kts‎
Lines changed: 40 additions & 20 deletions
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_and_test:
+  build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false # Continue with other matrix items if one fails
@@ -22,20 +22,18 @@ jobs:
         include:
           - variant: 'huawei'
             extra_build_command_options: '-Phuawei=1'
-          - variant: 'play'
-            run_test: true
     steps:
       - uses: actions/checkout@v6
-        with:
-          submodules: 'recursive'
 
-      - name: Cache Gradle
-        uses: actions/cache@v5
+      - name: Restore gradle cache
+        uses: actions/cache/restore@v5
         with:
           path: |
             ~/.gradle/caches
             .gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}-${{ matrix.variant }}
+          key: ${{ runner.os }}-gradle-dev-${{ matrix.variant }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-dev-${{ matrix.variant }}-
 
       - name: Set up JDK 21
         uses: actions/setup-java@v5
@@ -47,10 +45,15 @@ jobs:
         id: build
         run: ./gradlew assemble${{ matrix.variant }}${{ matrix.build_type }} ${{ matrix.extra_build_command_options }} --stacktrace
 
-      - name: Run unit tests
-        if: ${{ matrix.run_test == true }}
-        id: test
-        run: ./gradlew test${{ matrix.variant }}${{ matrix.build_type }}UnitTest ${{ matrix.extra_build_command_options }}
+      - name: Save gradle cache
+        uses: actions/cache/save@v5
+        # Only save cache on dev
+        if: github.ref_name == 'dev'
+        with:
+          path: |
+            ~/.gradle/caches
+            .gradle
+          key: ${{ runner.os }}-gradle-dev-${{ matrix.variant }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
 
       - name: Upload build reports regardless
         if: always()
@@ -67,3 +70,45 @@ jobs:
           path: app/build/outputs/apk/${{ matrix.variant }}/${{ matrix.build_type }}/*-universal*apk
           if-no-files-found: error
           compression-level: 0
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Restore Gradle cache
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            ~/.gradle/caches
+            .gradle
+          key: ${{ runner.os }}-test-dev-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-test-dev-
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Build with gradle
+        id: build
+        run: ./gradlew testPlayDebugUnitTest --stacktrace
+
+      - name: Save gradle cache
+        uses: actions/cache/save@v5
+        # Only save cache on dev
+        if: github.ref_name == 'dev'
+        with:
+          path: |
+            ~/.gradle/caches
+            .gradle
+          key: ${{ runner.os }}-test-dev-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
+
+      - name: Upload build reports regardless
+        if: always()
+        uses: actions/upload-artifact@v6
+        with:
+          name: test-reports
+          path: app/build/reports
+          if-no-files-found: ignore
+
@@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.kotlin.plugin.compose)
     alias(libs.plugins.kotlin.plugin.parcelize)
@@ -20,14 +19,15 @@ plugins {
 }
 
 val huaweiEnabled = project.properties["huawei"] != null
+val splitApksEnabled = project.properties["splitApks"] == "true"
 val hasIncludedLibSessionUtilProject: Boolean = System.getProperty("session.libsession_util.project.path", "").isNotBlank()
 
 configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 442
-val canonicalVersionName = "1.31.3"
+val canonicalVersionCode = 443
+val canonicalVersionName = "1.32.0"
 
 val postFixSize = 10
 val abiPostFix = mapOf(
@@ -80,6 +80,14 @@ fun VariantDimension.setAuthorityPostfix(postfix: String) {
     buildConfigField("String", "AUTHORITY_POSTFIX", "\"$postfix\"")
 }
 
+fun VariantDimension.enableClientVersionCheck(enable: Boolean) {
+    buildConfigField(
+        "boolean",
+        "CHECK_VERSION",
+        if (enable) "true" else "false"
+    )
+}
+
 kotlin {
     compilerOptions {
         jvmToolchain(21)
@@ -105,7 +113,7 @@ android {
 
     splits {
         abi {
-            isEnable = !huaweiEnabled
+            isEnable = splitApksEnabled
             reset()
             include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
             isUniversalApk = true
@@ -152,9 +160,14 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
-
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                file("proguard-rules.pro")
+            )
             devNetDefaultOn(false)
+            enableClientVersionCheck(true)
             enablePermissiveNetworkSecurityConfig(false)
             setAlternativeAppName(null)
             setAuthorityPostfix("")
@@ -175,6 +188,7 @@ android {
 
             devNetDefaultOn(false)
             enablePermissiveNetworkSecurityConfig(true)
+            enableClientVersionCheck(false)
 
             setAlternativeAppName("Session QA")
             setAuthorityPostfix("")
@@ -184,52 +198,49 @@ android {
             initWith(getByName("qa"))
 
             devNetDefaultOn(true)
+            enableClientVersionCheck(false)
             setAlternativeAppName("Session AQA")
         }
 
         getByName("debug") {
             isDefault = true
-            isMinifyEnabled = false
             enableUnitTestCoverage = false
             signingConfig = signingConfigs.getByName("debug")
 
             applicationIdSuffix = ".${name}"
             enablePermissiveNetworkSecurityConfig(true)
             devNetDefaultOn(false)
+            enableClientVersionCheck(false)
             setAlternativeAppName("Session Debug")
             setAuthorityPostfix(".debug")
         }
     }
 
-    sourceSets {
-        getByName("test").apply {
-            java.srcDirs("$projectDir/src/sharedTest/java")
-            resources.srcDirs("$projectDir/src/main/assets")
-        }
+    testBuildType = "debug"
 
+    sourceSets {
         val firebaseCommonDir = "src/firebaseCommon"
         firebaseEnabledVariants.forEach { variant ->
-            maybeCreate(variant).java.srcDirs("$firebaseCommonDir/kotlin")
+            maybeCreate(variant).kotlin.directories += "$firebaseCommonDir/kotlin"
         }
 
         val nonPlayCommonDir = "src/nonPlayCommon"
         nonPlayVariants.forEach { variant ->
             maybeCreate(variant).apply {
-                java.srcDirs("$nonPlayCommonDir/kotlin")
-                resources.srcDirs("$nonPlayCommonDir/resources")
+                kotlin.directories += "$nonPlayCommonDir/kotlin"
+                resources.directories += "$nonPlayCommonDir/resources"
             }
         }
 
         val nonDebugDir = "src/nonDebug"
         nonDebugBuildTypes.forEach { buildType ->
             maybeCreate(buildType).apply {
-                java.srcDirs("$nonDebugDir/kotlin")
-                resources.srcDirs("$nonDebugDir/resources")
+                kotlin.directories += "$nonDebugDir/kotlin"
+                resources.directories += "$nonDebugDir/resources"
             }
         }
     }
 
-
     signingConfigs {
         create("play") {
             if (project.hasProperty("SESSION_STORE_FILE")) {
@@ -372,10 +383,20 @@ dependencies {
     if (huaweiEnabled) {
         val huaweiImplementation = configurations.maybeCreate("huaweiImplementation")
         huaweiImplementation(libs.huawei.push)
+
+        // These are compileOnly on the Huawei flavor so R8 can resolve optional HMS classes
+        // referenced by HMS Push during minification.
+        compileOnly(libs.huawei.hianalytics)
+        compileOnly(libs.huawei.availableupdate)
     }
 
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui)
+    implementation(libs.androidx.media3.session)
+    implementation(libs.androidx.media3.common.ktx)
+    implementation(libs.androidx.media3.ui.compose)
+    implementation(libs.androidx.media3.ui.compose.material3)
+
     implementation(libs.conscrypt.android)
     implementation(libs.android)
     implementation(libs.photoview)
@@ -387,11 +408,9 @@ dependencies {
     implementation(libs.subsampling.scale.image.view) {
         exclude(group = "com.android.support", module = "support-annotations")
     }
-    implementation(libs.stream)
     implementation(libs.androidx.sqlite.ktx)
     implementation(libs.sqlcipher.android)
     implementation(libs.kotlinx.serialization.json)
-    implementation(libs.jackson.databind)
     implementation(libs.okhttp)
     implementation(libs.phrase)
     implementation(libs.copper.flow)
@@ -470,6 +489,7 @@ dependencies {
     implementation(libs.zxing.core)
 
     implementation(libs.androidx.biometric)
+    implementation(libs.autolink)
 
     playImplementation(libs.android.billing)
     playImplementation(libs.android.billing.ktx)