Merge pull request #1377 from session-foundation/release/1.27.0

Prepare for Release/1.27.0

Author: ThomasSession

.drone.jsonnet

@@ -37,11 +37,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
         image: docker_base + 'android',
         pull: 'always',
         environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
-        mem_limit: "8g",
         commands: [
-          'apt-get update --allow-releaseinfo-change',
-          'apt-get install -y ninja-build openjdk-21-jdk',
-          'update-java-alternatives -s java-1.21.0-openjdk-amd64',
           './gradlew testPlayDebugUnitTestCoverageReport'
         ],
       }
@@ -73,7 +69,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
     platform: { arch: 'amd64' },
     trigger: {
         event: ['push'],
-        branch: ['master', 'dev', 'release/*']
+        branch: ['master', 'dev', 'release/*', 'fix-ci-*']
     },
     steps: [
       version_info,
@@ -82,14 +78,10 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
         name: 'Build and upload',
         image: docker_base + 'android',
         pull: 'always',
-        mem_limit: "8g",
         environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
         commands: [
-          'apt-get update --allow-releaseinfo-change',
-          'apt-get install -y ninja-build openjdk-21-jdk',
-          'update-java-alternatives -s java-1.21.0-openjdk-amd64',
-          './gradlew --no-daemon assemblePlayDebug assembleWebsiteDebug',
-          './gradlew --no-daemon -Phuawei=1 assembleHuaweiDebug',
+          './gradlew assemblePlayQa',
+          './gradlew assemblePlayAutomaticQa',
           './scripts/drone-static-upload.sh'
         ],
       }

.github/workflows/build_and_test.yml

@@ -17,34 +17,40 @@ jobs:
     strategy:
       fail-fast: false # Continue with other matrix items if one fails
       matrix:
-        variant: [ 'play', 'website', 'huawei' ]
-        build_type: [ 'debug' ]
+        variant: [ 'play', 'website', 'huawei', 'fdroid' ]
+        build_type: [ 'qa' ]
         include:
           - variant: 'huawei'
             extra_build_command_options: '-Phuawei=1'
+          - variant: 'play'
+            run_test: true
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
       - name: Cache Gradle
         uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             .gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}-${{ matrix.variant }}
 
-      - uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
 
-      - name: Build and test with Gradle
+      - name: Build with gradle
         id: build
-        run: ./gradlew assemble${{ matrix.variant }}${{ matrix.build_type }} test${{ matrix.variant }}${{ matrix.build_type }}UnitTest  ${{ matrix.extra_build_command_options }}
+        run: ./gradlew assemble${{ matrix.variant }}${{ matrix.build_type }} ${{ matrix.extra_build_command_options }}
+
+      - 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: Upload build reports regardless
         if: always()

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.android.build.api.dsl.VariantDimension
 import com.android.build.api.variant.FilterConfiguration
 import java.io.ByteArrayOutputStream
 
@@ -24,8 +25,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 415
-val canonicalVersionName = "1.26.0"
+val canonicalVersionCode = 416
+val canonicalVersionName = "1.27.0"
 
 val postFixSize = 10
 val abiPostFix = mapOf(
@@ -44,6 +45,39 @@ val getGitHash = providers
     .asText
     .map { it.trim() }
 
+val firebaseEnabledVariants = listOf("play", "fdroid")
+val nonPlayVariants = listOf("fdroid", "website") + if (huaweiEnabled) listOf("huawei") else emptyList()
+
+fun VariantDimension.devNetDefaultOn(defaultOn: Boolean) {
+    val fqEnumClass = "org.session.libsession.utilities.Environment"
+    buildConfigField(
+        fqEnumClass,
+        "DEFAULT_ENVIRONMENT",
+        if (defaultOn) "$fqEnumClass.DEV_NET" else "$fqEnumClass.MAIN_NET"
+    )
+}
+
+fun VariantDimension.enablePermissiveNetworkSecurityConfig(permissive: Boolean) {
+    manifestPlaceholders["network_security_config"] = if (permissive) {
+        "@xml/network_security_configuration_permissive"
+    } else {
+        "@xml/network_security_configuration"
+    }
+}
+
+fun VariantDimension.setAlternativeAppName(alternative: String?) {
+    if (alternative != null) {
+        manifestPlaceholders["app_name"] = alternative
+    } else {
+        manifestPlaceholders["app_name"] = "@string/app_name"
+    }
+}
+
+fun VariantDimension.setAuthorityPostfix(postfix: String) {
+    manifestPlaceholders["authority_postfix"] = postfix
+    buildConfigField("String", "AUTHORITY_POSTFIX", "\"$postfix\"")
+}
+
 kotlin {
     compilerOptions {
         jvmToolchain(21)
@@ -110,27 +144,73 @@ android {
         }
     }
 
-    sourceSets {
-        val sharedTestDir = "src/sharedTest/java"
-        getByName("test").java.srcDirs(sharedTestDir)
-        getByName("androidTest").java.srcDirs(sharedTestDir)
-
-        getByName("test").resources.srcDirs("$projectDir/src/main/assets")
-    }
-
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
+
+            devNetDefaultOn(false)
+            enablePermissiveNetworkSecurityConfig(false)
+            setAlternativeAppName(null)
+            setAuthorityPostfix("")
+        }
+
+        create("qa") {
+            initWith(getByName("release"))
+
+            matchingFallbacks += "release"
+
+            signingConfig = signingConfigs.getByName("debug")
+            applicationIdSuffix = ".$name"
+
+            devNetDefaultOn(false)
+            enablePermissiveNetworkSecurityConfig(true)
+
+            setAlternativeAppName("Session QA")
+            setAuthorityPostfix(".qa")
+        }
+
+        create("automaticQa") {
+            initWith(getByName("qa"))
+
+            devNetDefaultOn(true)
+            setAlternativeAppName("Session AQA")
         }
 
         getByName("debug") {
             isDefault = true
             isMinifyEnabled = false
             enableUnitTestCoverage = false
             signingConfig = signingConfigs.getByName("debug")
+
+            applicationIdSuffix = ".${name}"
+            enablePermissiveNetworkSecurityConfig(true)
+            devNetDefaultOn(false)
+            setAlternativeAppName("Session Debug")
+            setAuthorityPostfix(".debug")
         }
     }
 
+    sourceSets {
+        getByName("test").apply {
+            java.srcDirs("$projectDir/src/sharedTest/java")
+            resources.srcDirs("$projectDir/src/main/assets")
+        }
+
+        val firebaseCommonDir = "src/firebaseCommon"
+        firebaseEnabledVariants.forEach { variant ->
+            maybeCreate(variant).java.srcDirs("$firebaseCommonDir/kotlin")
+        }
+
+        val nonPlayCommonDir = "src/nonPlayCommon"
+        nonPlayVariants.forEach { variant ->
+            maybeCreate(variant).apply {
+                java.srcDirs("$nonPlayCommonDir/kotlin")
+                resources.srcDirs("$nonPlayCommonDir/resources")
+            }
+        }
+    }
+
+
     signingConfigs {
         create("play") {
             if (project.hasProperty("SESSION_STORE_FILE")) {
@@ -160,39 +240,38 @@ android {
         }
     }
 
+
     flavorDimensions += "distribution"
     productFlavors {
         create("play") {
             isDefault = true
             dimension = "distribution"
-            ext["websiteUpdateUrl"] = "null"
             buildConfigField("boolean", "PLAY_STORE_DISABLED", "false")
             buildConfigField("org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID")
-            buildConfigField("String", "NOPLAY_UPDATE_URL", ext["websiteUpdateUrl"] as String)
             buildConfigField("String", "PUSH_KEY_SUFFIX", "\"\"")
             signingConfig = signingConfigs.getByName("play")
         }
 
+        create("fdroid") {
+            initWith(getByName("play"))
+        }
+
         if (huaweiEnabled) {
             create("huawei") {
                 dimension = "distribution"
-                ext["websiteUpdateUrl"] = "null"
                 buildConfigField("boolean", "PLAY_STORE_DISABLED", "true")
                 buildConfigField("org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.HUAWEI")
-                buildConfigField("String", "NOPLAY_UPDATE_URL", ext["websiteUpdateUrl"] as String)
                 buildConfigField("String", "PUSH_KEY_SUFFIX", "\"_HUAWEI\"")
                 signingConfig = signingConfigs.getByName("huawei")
             }
         }
 
         create("website") {
-            dimension = "distribution"
-            ext["websiteUpdateUrl"] = "https://github.com/session-foundation/session-android/releases"
+            initWith(getByName("play"))
+
             buildConfigField("boolean", "PLAY_STORE_DISABLED", "true")
-            buildConfigField("org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID")
-            buildConfigField("String", "NOPLAY_UPDATE_URL", "\"${ext["websiteUpdateUrl"]}\"")
-            buildConfigField("String", "PUSH_KEY_SUFFIX", "\"\"")
         }
+
     }
 
     testOptions {
@@ -251,13 +330,20 @@ dependencies {
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.core.ktx)
 
-    val playImplementation = configurations.maybeCreate("playImplementation")
-    playImplementation(libs.firebase.messaging) {
-        exclude(group = "com.google.firebase", module = "firebase-core")
-        exclude(group = "com.google.firebase", module = "firebase-analytics")
-        exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
+    // Add firebase dependencies to specific variants
+    for (variant in firebaseEnabledVariants) {
+        val configuration = configurations.maybeCreate("${variant}Implementation")
+        configuration(libs.firebase.messaging) {
+            exclude(group = "com.google.firebase", module = "firebase-core")
+            exclude(group = "com.google.firebase", module = "firebase-analytics")
+            exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
+        }
     }
 
+    val playImplementation = configurations.maybeCreate("playImplementation")
+    playImplementation(libs.google.play.review)
+    playImplementation(libs.google.play.review.ktx)
+
     if (huaweiEnabled) {
         val huaweiImplementation = configurations.maybeCreate("huaweiImplementation")
         huaweiImplementation(libs.huawei.push)
@@ -267,7 +353,6 @@ dependencies {
     implementation(libs.androidx.media3.ui)
     implementation(libs.conscrypt.android)
     implementation(libs.android)
-    implementation(libs.shortcutbadger)
     implementation(libs.photoview)
     implementation(libs.glide)
     implementation(libs.compose)
@@ -357,7 +442,6 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
 
     implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.drawablepainter)
 
     implementation(libs.androidx.camera.camera2)
     implementation(libs.androidx.camera.lifecycle)
@@ -393,10 +477,12 @@ androidComponents {
     }
 }
 
-// Disable google services for non-google variants
+// Only enable google services tasks for firebase-enabled variants
 androidComponents {
     finalizeDsl {
         tasks.named { it.contains("GoogleServices") }
-            .configureEach { enabled = name.contains("play", true) }
+            .configureEach {
+                enabled = firebaseEnabledVariants.any { name.contains(it, true) }
+            }
     }
 }