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

Verified Commit 810a5cca authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update build tools

parent 4c4277b7

build.gradle

+5 −5
Original line number Diff line number Diff line
@@ -21,20 +21,20 @@ buildscript { 
        google()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.1.3'

        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

        classpath 'com.android.tools.build:gradle:3.5.1'

        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'

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

    }

}



allprojects {

    apply plugin: 'idea'

    ext.androidBuildVersionTools = "28.0.3"

    ext.androidBuildVersionTools = "29.0.2"

}



def androidCompileSdk() { return 28 }

def androidCompileSdk() { return 29 }



def androidTargetSdk() { return 28 }

def androidTargetSdk() { return 29 }



def androidMinSdk() { return 14 }

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

play-services-basement/build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -36,7 +36,11 @@ android { 
    compileSdkVersion androidCompileSdk()

    buildToolsVersion "$androidBuildVersionTools"



    aidlPackageWhiteList "com/google/android/gms/common/api/Status.aidl"

    aidlPackageWhiteList "com/google/android/gms/common/data/DataHolder.aidl"

    aidlPackageWhiteList "com/google/android/gms/common/images/WebImage.aidl"

    aidlPackageWhiteList "com/google/android/gms/common/internal/ICancelToken.aidl"

    aidlPackageWhiteList "com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl"

    aidlPackageWhiteList "com/google/android/gms/dynamic/IObjectWrapper.aidl"



    defaultConfig {

play-services-cast-api/build.gradle

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ android { 
    compileSdkVersion androidCompileSdk()

    buildToolsVersion "$androidBuildVersionTools"



    aidlPackageWhiteList "com/google/android/gms/cast/ApplicationMetadata.aidl"

    aidlPackageWhiteList "com/google/android/gms/cast/LaunchOptions.aidl"



    defaultConfig {

        versionName getMyVersionName()

        minSdkVersion androidMinSdk()