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

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

Update gradle, build tools, dependencies

parent 0596d2c6

.travis.yml

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

sudo: false

git:

  submodules: false

before_install:

  - git submodule update --init --recursive

script:

  - jdk_switcher use oraclejdk8

  - echo sdk.dir $ANDROID_HOME > local.properties
@@ -14,12 +10,8 @@ android: 
  components:

  - tools

  - platform-tools

  - build-tools-25.0.2

  - android-25

  - 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

+8 −9
Original line number Diff line number Diff line
@@ -17,22 +17,25 @@ 
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"

    ext.supportLibraryVersion = "27.0.2"

    ext.isReleaseVersion = false

    ext.slf4jVersion = "1.7.25"

}



def androidCompileSdk() { return 25 }

def androidCompileSdk() { return 27 }



def androidTargetSdk() { return 23 }

def androidTargetSdk() { return 27 }



def androidMinSdk() { return 9 }
@@ -55,11 +58,7 @@ subprojects { 
    group = 'org.microg'

    repositories {

        jcenter()

    }



    tasks.withType(JavaCompile) {

        sourceCompatibility = JavaVersion.VERSION_1_7

        targetCompatibility = JavaVersion.VERSION_1_7

        maven { url "https://maven.google.com" }

    }

}

GmsApi @ 0e994f38

Compare c90a6851 to 0e994f38
Original line number Diff line number Diff line 
Subproject commit c90a6851b2384a78b5a7a6bcd1b5e21c3d11c4ca
 
Subproject commit 0e994f38058df014ea709de7826890ccc334b647

GmsLib @ 0c8fd3f7

Compare b5342173 to 0c8fd3f7
Original line number Diff line number Diff line 
Subproject commit b5342173d388ebde73180e94014a62480a7cd9dd
 
Subproject commit 0c8fd3f78ea47b59ec9e2716d83c46ffc8fa770b

RemoteDroidGuard @ 47073dd7

Compare 8eabc788 to 47073dd7
Original line number Diff line number Diff line 
Subproject commit 8eabc788fda79ac986f09721afbeea53612096b7
 
Subproject commit 47073dd7a2a039593fe556af8f9f33e325febfa7