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

Commit 647e199f authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1720-Update_to_v4_3_6_1' into 'main' 

1720-Update to v4.3.6.1-ose

See merge request !109
parents da19eac2 31d794f4

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:1263-Add_java_17_support"

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:master"



stages:

  - update-from-upstream

app/build.gradle

+15 −16
Original line number Diff line number Diff line
@@ -13,14 +13,13 @@ plugins { 


// Android configuration

android {

    compileSdkVersion 33

    buildToolsVersion '33.0.2'

    compileSdk 34



    defaultConfig {

        applicationId "foundation.e.accountmanager"



        versionCode 403050200

        versionName '4.3.5.2'

        versionCode 403060100

        versionName '4.3.6.1'



        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
@@ -53,7 +52,7 @@ android { 
    composeOptions {

        // Keep this in sync with Kotlin version:

        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin

        kotlinCompilerExtensionVersion = "1.4.8"

        kotlinCompilerExtensionVersion = "1.5.1"

    }



    // Java namespace for our classes (not to be confused with Android package ID)
@@ -134,7 +133,7 @@ ksp { 
}



configurations {

    all {

    configureEach {

        // exclude modules which are in conflict with system libraries

        exclude module: "commons-logging"

        exclude group: "org.json", module: "json"
@@ -146,7 +145,7 @@ configurations { 


dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'



    implementation "com.google.dagger:hilt-android:${versions.hilt}"
@@ -154,21 +153,21 @@ dependencies { 


    // support libs

    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.browser:browser:1.5.0'

    implementation 'androidx.browser:browser:1.6.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.concurrent:concurrent-futures-ktx:1.1.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation 'androidx.core:core-ktx:1.10.1'

    implementation 'androidx.fragment:fragment-ktx:1.6.0'

    implementation 'androidx.fragment:fragment-ktx:1.6.1'

    implementation 'androidx.hilt:hilt-work:1.0.0'

    kapt 'androidx.hilt:hilt-compiler:1.0.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'

    implementation 'androidx.paging:paging-runtime-ktx:3.1.1'

    implementation 'androidx.preference:preference-ktx:1.2.0'

    implementation 'androidx.paging:paging-runtime-ktx:3.2.0'

    implementation 'androidx.preference:preference-ktx:1.2.1'

    implementation 'androidx.security:security-crypto:1.1.0-alpha06'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.work:work-runtime-ktx:2.8.1'

    implementation "androidx.work:work-runtime-ktx:${versions.workManager}"

    implementation 'com.google.android.flexbox:flexbox:3.0.0'

    implementation 'androidx.recyclerview:recyclerview:1.3.0'

    implementation 'com.google.android.material:material:1.9.0'
@@ -190,11 +189,11 @@ dependencies { 


    // own libraries

    implementation "com.github.bitfireAT:cert4android:${versions.cert4android}"

    implementation files('../libs/ical4android.aar')

    implementation "foundation.e.lib:ical4android:${versions.ical4android}"

    implementation "foundation.e.lib:vcard4android:${versions.vcard4android}"



    // third-party libs

    implementation 'org.mnode.ical4j:ical4j:3.2.11'

    implementation 'org.mnode.ical4j:ical4j:3.2.13'

    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"

    implementation("com.github.bitfireAT:dav4jvm:${versions.dav4jvm}") {
@@ -240,9 +239,9 @@ dependencies { 
    androidTestImplementation 'androidx.test:runner:1.5.2'

    androidTestImplementation 'androidx.test:rules:1.5.0'

    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'

    androidTestImplementation 'androidx.work:work-testing:2.8.1'

    androidTestImplementation "androidx.work:work-testing:${versions.workManager}"

    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

    androidTestImplementation 'io.mockk:mockk-android:1.13.4'

    androidTestImplementation 'io.mockk:mockk-android:1.13.7'

    androidTestImplementation 'junit:junit:4.13.2'



    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

app/src/androidTest/java/at/bitfire/davdroid/TestUtils.kt

+9 −0
Original line number Diff line number Diff line
@@ -11,12 +11,21 @@ import androidx.work.WorkInfo 
import androidx.work.WorkManager

import androidx.work.WorkQuery

import org.jetbrains.annotations.TestOnly

import org.junit.Assert.assertTrue

import java.util.concurrent.CountDownLatch

import java.util.concurrent.TimeUnit

import java.util.concurrent.TimeoutException



object TestUtils {



    fun assertWithin(expected: Long, actual: Long, tolerance: Long) {

        val absDifference = Math.abs(expected - actual)

        assertTrue(

            "$actual not within ($expected ± $tolerance)",

            absDifference <= tolerance

        )

    }



    @TestOnly

    fun workScheduledOrRunning(context: Context, workerName: String): Boolean =

        workInStates(context, workerName, listOf(

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ import androidx.test.platform.app.InstrumentationRegistry 
import at.bitfire.davdroid.InitCalendarProviderRule

import at.bitfire.ical4android.AndroidCalendar

import at.bitfire.ical4android.Event

import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat

import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter

import at.bitfire.ical4android.util.MiscUtils.closeCompat

import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter

import net.fortuna.ical4j.model.property.DtStart

import net.fortuna.ical4j.model.property.RRule

import net.fortuna.ical4j.model.property.RecurrenceId

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalEventTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import androidx.test.platform.app.InstrumentationRegistry 
import at.bitfire.davdroid.InitCalendarProviderRule

import at.bitfire.ical4android.AndroidCalendar

import at.bitfire.ical4android.Event

import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat

import at.bitfire.ical4android.util.MiscUtils.closeCompat

import at.techbee.jtx.JtxContract.asSyncAdapter

import net.fortuna.ical4j.model.Date

import net.fortuna.ical4j.model.DateList