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

Unverified Commit 4c32a11c authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update gradle and build tools 



Co-authored-by: default avatarOliver Scott <olivercscott@gmail.com>
parent 8590f6d6

build.gradle

+4 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
    ext.cronetVersion = '102.5005.125'

    ext.wearableVersion = '0.1.1'



    ext.kotlinVersion = '1.7.10'

    ext.kotlinVersion = '1.7.22'

    ext.coroutineVersion = '1.6.4'



    ext.annotationVersion = '1.5.0'
@@ -26,11 +26,11 @@ buildscript { 


    ext.slf4jVersion = '1.7.36'

    ext.volleyVersion = '1.2.1'

    ext.wireVersion = '4.4.1'

    ext.wireVersion = '4.8.0'



    ext.androidBuildGradleVersion = '7.2.1'

    ext.androidBuildGradleVersion = '8.0.2'



    ext.androidBuildVersionTools = '33.0.0'

    ext.androidBuildVersionTools = '33.0.1'



    ext.androidMinSdk = 14

    ext.androidTargetSdk = 29
@@ -53,7 +53,6 @@ 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"

    }

}

firebase-auth/build.gradle

+5 −0
Original line number Diff line number Diff line
@@ -6,9 +6,14 @@ 
apply plugin: 'com.android.library'



android {

    namespace 'com.google.firebase.auth'

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    buildFeatures {

        aidl = true

    }



    defaultConfig {

        versionName version

        minSdkVersion androidMinSdk

firebase-auth/core/build.gradle

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ dependencies { 
}



android {

    namespace "org.microg.gms.firebase.auth.core"



    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"
@@ -41,4 +43,8 @@ android { 
        sourceCompatibility = 1.8

        targetCompatibility = 1.8

    }



    kotlinOptions {

        jvmTarget = 1.8

    }

}

firebase-auth/core/src/main/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 
  ~ SPDX-FileCopyrightText: 2020, microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="org.microg.gms.firebase.auth.core">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">



    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.RECEIVE_SMS" />

firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class IdentityToolkitClient(context: Context, private val apiKey: String, privat 
                    .put("password", password)

                    .put("displayName", displayName)

                    .put("photoUrl", photoUrl)

                    .put("deleteAttribute", JSONArray().apply { deleteAttribute.forEach { put(it) } }))

                    .put("deleteAttribute", JSONArray().apply { deleteAttribute.map { put(it) } }))



    suspend fun signupNewUser(email: String? = null, password: String? = null, tenantId: String? = null): JSONObject =

            request("signupNewUser", JSONObject()