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

Commit ad076c51 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'dev' into 'dev' 

Updated gradle

See merge request e/apps/camera!11
parents 3777a9d9 b8df49cb

app/build.gradle

+5 −4
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 28

    compileSdkVersion 29

    compileOptions.encoding = 'UTF-8'



    defaultConfig {

        applicationId "foundation.e.camera"

        minSdkVersion 15

        targetSdkVersion 28

        minSdkVersion 21

        targetSdkVersion 29



        renderscriptTargetApi 21

        //renderscriptSupportModeEnabled true // don't use support library as it bloats the APK, and we don't need pre-4.4 support
@@ -38,6 +38,7 @@ android { 
}



dependencies {

    //noinspection GradleCompatible

    implementation 'com.android.support:support-v4:28.0.0'

    testImplementation 'junit:junit:4.12'

    testImplementation 'junit:junit:4.13'

}

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ buildscript { 
        jcenter()

    }

    dependencies {

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

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

    }

}

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-5.4.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip