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

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

Update gradle, build tools

parent 8eabc788

.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'

    }

}



allprojects {

    apply plugin: 'idea'

    ext.androidBuildVersionTools = "25.0.2"

    ext.androidBuildVersionTools = "27.0.3"

    ext.isReleaseVersion = false

}



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

remote-droid-guard-lib/build.gradle

+6 −1
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'



dependencies {

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

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

}



String getMyVersionName() {
@@ -33,6 +33,11 @@ android { 
        versionCode getMyVersionCode()

        minSdkVersion androidMinSdk()

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

}



if (file('user.gradle').exists()) {

remote-droid-guard/build.gradle

+10 −8
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ repositories { 
}



dependencies {

    compile 'com.squareup.wire:wire-runtime:1.6.1'

    compile ':droidguasso:@jar'

    compile project(':remote-droid-guard-lib')

    implementation 'com.squareup.wire:wire-runtime:1.6.1'

    implementation ':droidguasso:@jar'

    implementation project(':remote-droid-guard-lib')

}



String getMyVersionName() {
@@ -41,19 +41,21 @@ android { 
        versionCode getMyVersionCode()

        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

        jackOptions {

            enabled true

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }



    sourceSets {

        main {

            java.srcDirs += 'src/main/protos-java'

            java.srcDirs += "src/main/protos-java"

        }

    }



    lintOptions {

        disable 'InvalidPackage'

        disable "InvalidPackage"

    }



    dexOptions {