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

Commit c06af8d4 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'upstream/master' into 1633-import-latest-microg-refactoring

parents dec60171 14dfd3e7

.travis.yml

+14 −14
Original line number Diff line number Diff line 
language: android

sudo: false

script:

  - jdk_switcher use oraclejdk8

language: java

jdk: openjdk8

install:

  - mkdir $HOME/android-cmdline-tools

  - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip

  - unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools'

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3'

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-30'

env:

  - ANDROID_HOME=$HOME/android-sdk TERM=dumb JAVA_OPTS="-Xmx2048m"

before_script:

  - echo sdk.dir $ANDROID_HOME > local.properties

  - export TERM=dumb

  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"

  - ./gradlew --stacktrace assemble

android:

  components:

  - tools

  - platform-tools

  - build-tools-29.0.3

  - android-29

  - extra-android-m2repository
 
script:

  - ./gradlew --no-daemon build

build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 */



buildscript {

    ext.nlpVersion = '2.0-alpha3'

    ext.nlpVersion = '2.0-alpha4'

    ext.remoteDroidGuardVersion = '0.1.2'

    ext.safeParcelVersion = '1.6.0'

    ext.wearableVersion = '0.1.1'
@@ -25,6 +25,7 @@ buildscript { 


    ext.supportLibraryVersion = '28.0.0'

    ext.slf4jVersion = '1.7.25'

    ext.volleyVersion = '1.1.1'

    ext.wireVersion = '3.2.2'



    ext.androidBuildGradleVersion = '3.6.3'
@@ -33,7 +34,7 @@ buildscript { 


    ext.androidMinSdk = 14

    ext.androidTargetSdk = 29

    ext.androidCompileSdk = 29

    ext.androidCompileSdk = 30



    repositories {

        jcenter()
@@ -56,7 +57,7 @@ def execResult(...args) { 
    return stdout.toString().trim()

}



def gmsVersion = "20.33.15"

def gmsVersion = "20.39.15"

def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))

def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)

def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

firebase-auth-api/build.gradle

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2020, microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



apply plugin: 'com.android.library'



android {

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    compileOptions {

        sourceCompatibility = 1.8

        targetCompatibility = 1.8

    }

}



dependencies {

    api project(':play-services-basement')

}

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

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ SPDX-FileCopyrightText: 2020, microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->



<manifest package="org.microg.gms.firebase.auth.api" />

firebase-auth-api/src/main/aidl/com/google/firebase/auth/ActionCodeSettings.aidl

0 → 100644
+3 −0
Original line number Diff line number Diff line 
package com.google.firebase.auth;



parcelable ActionCodeSettings;