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

Unverified Commit 6a2c3663 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dependencies; CI: don't checkout submodules

parent 4ba50b96

.github/workflows/codeql.yml

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ jobs: 
    steps:

    - name: Checkout repository

      uses: actions/checkout@v3

      with:

        submodules: recursive

    - uses: actions/setup-java@v3

      with:

        distribution: 'temurin'

.github/workflows/release.yml

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v3

        with:

          submodules: true

      - uses: actions/setup-java@v3

        with:

          distribution: temurin

.github/workflows/test-dev.yml

+0 −4
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v3

        with:

          submodules: true

      - uses: actions/setup-java@v3

        with:

          distribution: temurin
@@ -36,8 +34,6 @@ jobs: 
        api-level: [ 31 ]

    steps:

      - uses: actions/checkout@v3

        with:

          submodules: true

      - uses: actions/setup-java@v3

        with:

          distribution: temurin

app/build.gradle

+8 −8
Original line number Diff line number Diff line
@@ -121,10 +121,6 @@ configurations { 
}



dependencies {

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

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

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



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

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

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
@@ -132,6 +128,7 @@ dependencies { 
    implementation "com.google.dagger:hilt-android:${versions.hilt}"

    kapt "com.google.dagger:hilt-android-compiler:${versions.hilt}"



    // support libs

    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.browser:browser:1.5.0'

    implementation 'androidx.cardview:cardview:1.0.0'
@@ -150,12 +147,9 @@ dependencies { 
    implementation 'androidx.work:work-runtime-ktx:2.8.1'

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

    implementation 'com.google.android.material:material:1.9.0'

    implementation 'net.openid:appauth:0.11.1'



    // Jetpack Compose

    def composeBom = platform("androidx.compose:compose-bom:${versions.composeBom}")

    implementation composeBom

    androidTestImplementation composeBom

    implementation platform("androidx.compose:compose-bom:${versions.composeBom}")

    implementation 'androidx.compose.material:material'

    implementation 'androidx.compose.runtime:runtime-livedata'

    debugImplementation 'androidx.compose.ui:ui-tooling'
@@ -169,6 +163,11 @@ dependencies { 
    kapt "androidx.room:room-compiler:${versions.room}"

    androidTestImplementation "androidx.room:room-testing:${versions.room}"



    // own libraries

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

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

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



    // third-party libs

    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"
@@ -183,6 +182,7 @@ dependencies { 
    implementation 'commons-io:commons-io:2.8.0'

    //noinspection GradleDependency - dnsjava 3+ needs Java 8/Android 7

    implementation 'dnsjava:dnsjava:2.1.9'

    implementation 'net.openid:appauth:0.11.1'

    //noinspection GradleDependency

    implementation "org.apache.commons:commons-collections4:${versions.commonsCollections}"

    //noinspection GradleDependency

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


buildscript {

    ext.versions = [

        aboutLibraries: '10.6.2',

        aboutLibraries: '10.8.0',

        appIntro: '6.2.0',

        composeBom: '2023.05.01',

        hilt: '2.46.1',