Merge branch 'chore/core-9-2-2' into 'develop'

Update Core to 9.2.2 See merge request android/mail/proton-mail-android!1196
ProtonMail · Oct 31, 2022 · 7414525 · 7414525
2 parents 7fa6499 + 537773a
commit 7414525
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ firebase feature tests:
   dependencies:
     - build uiAutomation
   rules:
-    - if: '$TEST_TYPE == "feature" || $TEST_TYPE == "regression"'
+    - when: never
   tags:
     - medium
   variables:

diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt
@@ -26,9 +26,7 @@ import ch.protonmail.android.uitests.testsHelper.TestData.fwSubject
 import ch.protonmail.android.uitests.testsHelper.TestData.updatedSubject
 import ch.protonmail.android.uitests.testsHelper.TestUser.internalEmailTrustedKeys
 import ch.protonmail.android.uitests.testsHelper.TestUser.onePassUser
-import ch.protonmail.android.uitests.testsHelper.annotations.SmokeTest
 import ch.protonmail.android.uitests.testsHelper.annotations.TestId
-import org.junit.experimental.categories.Category
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
@@ -69,7 +67,6 @@ class ForwardMessageTests : BaseTest() {
     }
 
     @TestId("1950")
-    @Category(SmokeTest::class)
     @Test
     fun forwardMessageWithAttachment() {
         val to = internalEmailTrustedKeys.email

diff --git a/buildSrc/src/main/kotlin/ProtonMail.kt b/buildSrc/src/main/kotlin/ProtonMail.kt
@@ -25,8 +25,8 @@ import org.gradle.api.JavaVersion
  */
 object ProtonMail {
 
-    const val versionName = "3.0.8"
-    const val versionCode = 922
+    const val versionName = "3.0.9"
+    const val versionCode = 923
 
     const val compileSdk = 32
     const val targetSdk = 31

diff --git a/buildSrc/src/main/kotlin/versionsConfig.kt b/buildSrc/src/main/kotlin/versionsConfig.kt
@@ -62,7 +62,7 @@ fun initVersions() {
 }
 
 // Proton Core
-const val `Proton-core version` =               "9.2.1"
+const val `Proton-core version` =               "9.2.2"
 
 // Test
 const val `aerogear version` =                  "1.0.0"         // Released: Mar 23, 2013

diff --git a/proton-libs b/proton-libs