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

Commit 7ec632e4 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'dev' into 'master'

[RELEASE] Sprint JJ

See merge request e/apps/camera!12
parents 7dd7fa74 110a3702
Loading
Loading
Loading
Loading
Loading
+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'
}
+139 −148

File changed.

Preview size limit exceeded, changes collapsed.

+2 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
 No newline at end of file
+625 −217

File changed.

Preview size limit exceeded, changes collapsed.

+195 −17

File changed.

Preview size limit exceeded, changes collapsed.

Loading