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

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

Update gradle, build tools

parent c90a6851

.travis.yml

+6 −12
Original line number Diff line number Diff line 
language: android

git:

  submodules: false

before_install:

  - git submodule update --init --recursive

script:

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

  - export TERM=dumb
@@ -12,12 +8,10 @@ script: 
android:

  components:

  - tools

  - build-tools-25.0.2

  - android-25

  - platform-tools

  - build-tools-27.0.3

  - android-27

  - extra-android-m2repository

before_cache:

  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

cache:

  directories:

    - $HOME/.gradle/caches/

    - $HOME/.gradle/wrapper/
 
before_install:

 - yes | sdkmanager "platforms;android-27"

build.gradle

+5 −4
Original line number Diff line number Diff line
@@ -17,21 +17,22 @@ 
buildscript {

    repositories {

        jcenter()

        google()

    }

    dependencies {

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

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

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

    }

}



allprojects {

    apply plugin: 'idea'

    ext.androidBuildVersionTools = "25.0.2"

    ext.androidBuildVersionTools = "27.0.3"

}



def androidCompileSdk() { return 25 }

def androidCompileSdk() { return 27 }



def androidTargetSdk() { return 24 }

def androidTargetSdk() { return 27 }



def androidMinSdk() { return 9 }

gradle/wrapper/gradle-wrapper.properties

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

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

play-services-api/build.gradle

+8 −7
Original line number Diff line number Diff line
@@ -39,15 +39,16 @@ android { 
    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

}



dependencies {

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

    compile project(':play-services-cast-api')

    compile project(':play-services-cast-framework-api')

    compile project(':play-services-iid-api')

    compile project(':play-services-location-api')

    compile project(':play-services-wearable-api')

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

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

    api project(':play-services-cast-framework-api')

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

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

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

}

play-services-basement/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -44,11 +44,12 @@ android { 
    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

}



dependencies {

    compile 'com.android.support:support-v4:25.3.1'

    compile 'org.microg:safe-parcel:1.4.0'

    api 'com.android.support:support-v4:25.3.1'

    api 'org.microg:safe-parcel:1.4.0'

}