Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b977d9 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge tag 'v4.5.9-ose' of https://github.com/bitfireAT/davx5-ose into main-ose

parents 158a9f45 915cf730

.github/CODEOWNERS

+6 −2
Original line number Diff line number Diff line 
# See https://docs.github.com/de/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# For combination with "Require review from code owners" for main-ose branch.



# For combination with "Require review from code owners" for main-ose branch:

*      @bitfireAT/app-dev
 
# Dependabot

gradle/**   @bitfireAT/app-dev



# everything else

*   @rfc2822

.tx/config

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
[main]

host     = https://www.transifex.com

lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW



[o:bitfireAT:p:davx5:r:app]

file_filter   = app/src/main/res/values-<lang>/strings.xml

source_file   = app/src/main/res/values/strings.xml

source_lang   = en

type          = ANDROID

minimum_perc  = 20

resource_name = App strings (all flavors)





# Attention: fastlane directories are like "en-us", not "en-rUS"!



[o:bitfireAT:p:davx5:r:metadata-short-description]

file_filter   = fastlane/metadata/android/<lang>/short_description.txt

source_file   = fastlane/metadata/android/en-US/short_description.txt

source_lang   = en

type          = TXT

minimum_perc  = 100

resource_name = Metadata: short description

lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW



[o:bitfireAT:p:davx5:r:metadata-full-description]

file_filter   = fastlane/metadata/android/<lang>/full_description.txt

source_file   = fastlane/metadata/android/en-US/full_description.txt

source_lang   = en

type          = TXT

minimum_perc  = 100

resource_name = Metadata: full description

lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, mr_IN: mr-rIN, nb_NO: nb, pt_BR: pt-rBR, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW

app/build.gradle.kts

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ plugins { 
    alias(libs.plugins.android.application)

    alias(libs.plugins.compose.compiler)

    alias(libs.plugins.hilt)

    alias(libs.plugins.kotlin.android)

    alias(libs.plugins.kotlin.serialization)

    alias(libs.plugins.ksp)

    alias(libs.plugins.mikepenz.aboutLibraries.android)
@@ -25,10 +24,10 @@ android { 
    defaultConfig {

        applicationId = "at.bitfire.davdroid"



        versionCode = 405080003

        versionName = "4.5.8"

        versionCode = 405090005

        versionName = "4.5.9"



        base.archivesName = "davx5-ose-$versionName"

        base.archivesName = "davx5-$versionCode-$versionName"



        minSdk = 31        // Android 12 - canScheduleExactAlarms minimum requirement

        targetSdk = 36     // Android 16
@@ -242,6 +241,7 @@ dependencies { 
    implementation(libs.compose.accompanist.permissions)

    implementation(platform(libs.androidx.compose.bom))

    implementation(libs.androidx.compose.material3)

    implementation(libs.androidx.compose.material3.adaptive)

    implementation(libs.androidx.compose.materialIconsExtended)

    debugImplementation(libs.androidx.compose.ui.tooling)

    implementation(libs.androidx.compose.ui.toolingPreview)

app/src/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
espressoTest

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalCalendarStoreTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import org.junit.After 
import org.junit.Assert.assertEquals

import org.junit.Assume

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test

import org.junit.rules.TestRule
@@ -62,6 +63,7 @@ class LocalCalendarStoreTest { 
    }





    @Ignore("Flaky in CI")

    @Test

    fun testUpdateAccount_updatesOwnerAccount() {

        // Verify initial state (assume to skip and prevent flaky test failures)
@@ -76,7 +78,6 @@ class LocalCalendarStoreTest { 


        // Verify [Calendar.OWNER_ACCOUNT] of local calendar was updated

        assertEquals("ChangedAccountName", getOwnerAccount())



    }