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

Commit b6824766 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dependencies and tasks apps

parent 9b218349

.github/workflows/test-dev.yml

+7 −3
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ jobs: 


      - name: Install task apps and run tests

        uses: reactivecircus/android-emulator-runner@v2

        env:

          version_at_techbee_jtx: 205020009

          version_org_tasks: 130501

          version_org_dmfs_tasks: 82200

        with:

          api-level: ${{ matrix.api-level }}

          arch: x86_64
@@ -75,9 +79,9 @@ jobs: 
          disable-animations: true

          script: |

            mkdir .apk && cd .apk

            wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_80800.apk && adb install org.dmfs.tasks.apk

            wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_120400.apk && adb install org.tasks.apk

            wget -cq -O at.techbee.jtx.apk https://f-droid.org/archive/at.techbee.jtx_100140002.apk && adb install at.techbee.jtx.apk

            (wget -cq -O org.dmfs.tasks.apk https://f-droid.org/repo/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk || wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk) && adb install org.dmfs.tasks.apk

            (wget -cq -O org.tasks.apk https://f-droid.org/repo/org.tasks_${{ env.version_org_tasks }}.apk || wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_${{ env.version_org_tasks }}.apk) && adb install org.tasks.apk

            (wget -cq -O at.techbee.jtx.apk https://f-droid.org/repo/at.techbee.jtx_${{ env.version_at_techbee_jtx }}.apk || wget -cq -O at.techbee.jtx.apk https://f-droid.org/archive/at.techbee.jtx_${{ env.version_at_techbee_jtx }}.apk) && adb install at.techbee.jtx.apk

            cd ..

            ./gradlew --no-daemon connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest

lib/build.gradle.kts

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ plugins { 
    id("org.jetbrains.dokka")

}



val version_ical4j = "3.2.11"

val version_ical4j = "3.2.12"



android {

    compileSdk = 33
@@ -99,7 +99,7 @@ dependencies { 


    implementation("androidx.core:core-ktx:1.10.1")

    api("org.mnode.ical4j:ical4j:${version_ical4j}")

    implementation("org.slf4j:slf4j-jdk14:2.0.3")       // ical4j logging over java.util.Logger

    implementation("org.slf4j:slf4j-jdk14:2.0.7")       // ical4j logging over java.util.Logger



    // ical4j requires newer Apache Commons libraries, which require Java8. Force latest Java7 versions.

    // noinspection GradleDependency
@@ -121,6 +121,6 @@ dependencies { 
    androidTestImplementation("androidx.test:core:1.5.0")

    androidTestImplementation("androidx.test:runner:1.5.2")

    androidTestImplementation("androidx.test:rules:1.5.0")

    androidTestImplementation("io.mockk:mockk-android:1.13.4")

    androidTestImplementation("io.mockk:mockk-android:1.13.7")

    testImplementation("junit:junit:4.13.2")

}
 
 No newline at end of file