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

Commit 23bf474d authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #1735 from jberkel/use-properties-for-config 

Inject config from properties file
parents 03426485 8b1c7684

build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -9,19 +9,15 @@ buildscript { 
}



project.ext {

    preDexLibs = !project.hasProperty('disablePreDex')

    testCoverage = project.hasProperty('testCoverage')

    optimizeForDevelopment = project.hasProperty('optimizeForDevelopment') && optimizeForDevelopment == 'true'



    compileSdkVersion = 24

    buildToolsVersion = '24.0.3'

}



subprojects {

    project.plugins.whenPluginAdded { plugin ->

        if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) ||

                "com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {

            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs

            project.android.dexOptions.preDexLibraries = !rootProject.hasProperty('disablePreDex')

        }

    }

}

gradle.properties

0 → 100644
+7 −0
Original line number Diff line number Diff line 
androidCompileSdkVersion=24

androidBuildToolsVersion=24.0.3

androidSupportLibraryVersion=23.1.1



robolectricVersion=3.1.1

junitVersion=4.12

mockitoVersion=1.10.19

k9mail-library/build.gradle

+6 −6
Original line number Diff line number Diff line
@@ -19,20 +19,20 @@ dependencies { 
    compile 'commons-io:commons-io:2.4'

    compile 'com.jcraft:jzlib:1.0.7'

    compile 'com.beetstra.jutf7:jutf7:1.0.0'

    compile 'com.android.support:support-annotations:23.3.0'

    compile "com.android.support:support-annotations:${androidSupportLibraryVersion}"



    androidTestCompile 'com.android.support.test:runner:0.4.1'

    androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0'



    testCompile 'com.squareup.okio:okio:1.6.0'

    testCompile 'org.robolectric:robolectric:3.0'

    testCompile 'junit:junit:4.12'

    testCompile 'org.mockito:mockito-core:1.10.19'

    testCompile "org.robolectric:robolectric:${robolectricVersion}"

    testCompile "junit:junit:${junitVersion}"

    testCompile "org.mockito:mockito-core:${mockitoVersion}"

}



android {

    compileSdkVersion rootProject.compileSdkVersion

    buildToolsVersion rootProject.buildToolsVersion

    compileSdkVersion androidCompileSdkVersion.toInteger()

    buildToolsVersion androidBuildToolsVersion



    defaultConfig {

        minSdkVersion 15

k9mail/build.gradle

+7 −11
Original line number Diff line number Diff line
@@ -13,14 +13,10 @@ repositories { 
    jcenter()

}



ext {

    supportLibraryVersion = '23.1.1'

}



//noinspection GroovyAssignabilityCheck

configurations.all {

    resolutionStrategy {

        force "com.android.support:support-annotations:${project.supportLibraryVersion}"

        force "com.android.support:support-annotations:${androidSupportLibraryVersion}"

    }

}
@@ -30,7 +26,7 @@ dependencies { 
    compile project(':plugins:HoloColorPicker')

    compile project(':plugins:openpgp-api-lib:openpgp-api')

    compile 'commons-io:commons-io:2.4'

    compile "com.android.support:support-v4:${project.supportLibraryVersion}"

    compile "com.android.support:support-v4:${androidSupportLibraryVersion}"

    compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.16'

    compile 'de.cketti.library.changelog:ckchangelog:1.2.1'

    compile 'com.github.bumptech.glide:glide:3.6.1'
@@ -40,14 +36,14 @@ dependencies { 


    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'



    testCompile 'org.robolectric:robolectric:3.1.1'

    testCompile 'junit:junit:4.12'

    testCompile 'org.mockito:mockito-core:1.10.19'

    testCompile "org.robolectric:robolectric:${robolectricVersion}"

    testCompile "junit:junit:${junitVersion}"

    testCompile "org.mockito:mockito-core:${mockitoVersion}"

}



android {

    compileSdkVersion rootProject.compileSdkVersion

    buildToolsVersion rootProject.buildToolsVersion

    compileSdkVersion androidCompileSdkVersion.toInteger()

    buildToolsVersion androidBuildToolsVersion



    defaultConfig {

        applicationId "com.fsck.k9"

plugins/Android-PullToRefresh/library/build.gradle

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



android {

    compileSdkVersion rootProject.compileSdkVersion

    buildToolsVersion rootProject.buildToolsVersion

    compileSdkVersion androidCompileSdkVersion.toInteger()

    buildToolsVersion androidBuildToolsVersion



    sourceSets {

        main {