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

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

Update build tools, set sdk versions through gradle

parent 4bffa579

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ script: 
android:

  components:

  - tools

  - build-tools-24.0.2

  - build-tools-24.0.3

  - android-24

  - extra-android-m2repository

before_cache:

build.gradle

+5 −1
Original line number Diff line number Diff line
@@ -26,11 +26,15 @@ buildscript { 


allprojects {

    apply plugin: 'idea'

    ext.androidBuildVersionTools = "24.0.2"

    ext.androidBuildVersionTools = "24.0.3"

}



def androidCompileSdk() { return 24 }



def androidTargetSdk() { return 24 }



def androidMinSdk() { return 9 }



subprojects {

    group = 'org.microg'

    repositories {

GmsApi @ 0b4f43c6

Compare 9ff42ae7 to 0b4f43c6
Original line number Diff line number Diff line 
Subproject commit 9ff42ae73a02ea971dc557f657b612113dfa6e24
 
Subproject commit 0b4f43c6a6a091dbdeb0ec544d533373a83ea319

play-services-base/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ android { 


    defaultConfig {

        versionName getMyVersionName()

        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

    }



    compileOptions {

play-services-base/src/main/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
<manifest package="org.microg.gms.base"

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



    <uses-sdk android:minSdkVersion="9"/>



    <meta-data

        android:name="com.google.android.gms.version"

        android:value="@integer/google_play_services_version"/>