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

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

Update gradle, build tools, deps

parent b5342173

.travis.yml

+3 −10
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,9 @@ script: 
android:

  components:

  - tools

  - platform-tools

  - build-tools-25.0.2

  - android-25

  - 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 }

GmsApi @ 0e994f38

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

gradle/wrapper/gradle-wrapper.properties

+1 −17
Original line number Diff line number Diff line 
#

# Copyright 2013-2015 microG Project Team

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



#Sat Apr 22 15:09:21 CEST 2017

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-base/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ 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-tasks')

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

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

}