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

Commit e23c4cab authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge remote-tracking branch 'upstream/master'

parents dd90e21d 2f51d618

build.gradle

+12 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildscript { 
    ext.kotlinVersion = '1.7.10'

    ext.coroutineVersion = '1.6.4'



    ext.annotationVersion = '1.3.0'

    ext.annotationVersion = '1.5.0'

    ext.appcompatVersion = '1.4.2'

    ext.biometricVersion = '1.1.0'

    ext.coreVersion = '1.8.0'
@@ -21,7 +21,7 @@ buildscript { 
    ext.loaderVersion = '1.1.0'

    ext.mediarouterVersion = '1.3.1'

    ext.multidexVersion = '2.0.1'

    ext.navigationVersion = '2.5.1'

    ext.navigationVersion = '2.5.3'

    ext.preferenceVersion = '1.2.0'

    ext.recyclerviewVersion = '1.2.0'

    ext.webkitVersion = '1.4.0'
@@ -48,6 +48,7 @@ buildscript { 
        classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

        classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"

        classpath "com.github.kezong:fat-aar:1.3.8"

    }

}
@@ -102,4 +103,13 @@ subprojects { 
        google()

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }

    afterEvaluate {

        // Temporary hack for Android Studio

        if (project.plugins.hasPlugin('com.android.base')) {

            dependencies {

                compileOnly "org.microg:safe-parcel:$safeParcelVersion"

                testCompileOnly "org.microg:safe-parcel:$safeParcelVersion"

            }

        }

    }

}

firebase-auth-core/build.gradle→firebase-auth/core/build.gradle

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ apply plugin: 'com.android.library' 
apply plugin: 'kotlin-android'



dependencies {

    api project(':firebase-auth-api')

    api project(':firebase-auth')



    implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"

    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
@@ -15,7 +15,6 @@ dependencies { 
    implementation "androidx.appcompat:appcompat:$appcompatVersion"



    implementation project(':play-services-base-core')

    implementation project(':play-services-base-core-ui')



    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion"