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

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

Update Gradle, build tools, target sdk

parent 85e78694

.travis.yml

+7 −3
Original line number Diff line number Diff line
@@ -5,15 +5,19 @@ before_script: 
script:

  - jdk_switcher use oraclejdk8

  - export TERM=dumb

  - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"

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

  - ./gradlew build

android:

  components:

    - tools

    - platform-tools

    - build-tools-25.0.2

    - android-25

    - build-tools-27.0.3

    - android-27

    - extra-android-m2repository

  licenses:

    - '.+'

before_install:

 - yes | sdkmanager "platforms;android-27"

before_cache:

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

cache:

build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -17,19 +17,20 @@ 
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 }

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,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

unifiednlp-api/build.gradle

+6 −1
Original line number Diff line number Diff line
@@ -38,7 +38,12 @@ android { 
    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }



    lintOptions {

        ignore "MissingPermission"

    }

}

unifiednlp-api/src/main/java/org/microg/nlp/api/WiFiBackendHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class WiFiBackendHelper extends AbstractBackendHelper { 
        if (listener == null)

            throw new IllegalArgumentException("listener must not be null");

        this.listener = listener;

        this.wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        this.wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);

    }



    /**