Use variable for 'sourceCompatibility' and 'targetCompatibility' values

2019-11-13 16:10:14 +01:00 · 2019-11-13 16:10:14 +01:00 · 105622a999
commit 105622a999
parent b6819eabf1
18 changed files with 36 additions and 34 deletions
--- a/app/autodiscovery/build.gradle
+++ b/app/autodiscovery/build.gradle
@ -39,8 +39,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }

    testOptions {
--- a/app/core/build.gradle
+++ b/app/core/build.gradle
@ -55,8 +55,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }

    testOptions {
--- a/app/crypto-openpgp/build.gradle
+++ b/app/crypto-openpgp/build.gradle
@ -27,7 +27,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@ -98,8 +98,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }

    testOptions {
--- a/app/storage/build.gradle
+++ b/app/storage/build.gradle
@ -39,8 +39,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }

    testOptions {
--- a/app/testing/build.gradle
+++ b/app/testing/build.gradle
@ -29,7 +29,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/app/ui/build.gradle
+++ b/app/ui/build.gradle
@ -79,8 +79,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }

    testOptions {
--- a/backend/api/build.gradle
+++ b/backend/api/build.gradle
@ -24,7 +24,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/backend/imap/build.gradle
+++ b/backend/imap/build.gradle
@ -42,7 +42,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/backend/pop3/build.gradle
+++ b/backend/pop3/build.gradle
@ -42,7 +42,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/backend/webdav/build.gradle
+++ b/backend/webdav/build.gradle
@ -41,7 +41,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/build.gradle
+++ b/build.gradle
@ -33,6 +33,8 @@ buildscript {
                'mockitoKotlin': '1.5.0',
                'truth': '0.35'
        ]
+
+        javaVersion = JavaVersion.VERSION_1_7
    }

    repositories {
--- a/mail/common/build.gradle
+++ b/mail/common/build.gradle
@ -50,7 +50,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/mail/protocols/imap/build.gradle
+++ b/mail/protocols/imap/build.gradle
@ -48,7 +48,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/mail/protocols/pop3/build.gradle
+++ b/mail/protocols/pop3/build.gradle
@ -43,7 +43,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/mail/protocols/smtp/build.gradle
+++ b/mail/protocols/smtp/build.gradle
@ -43,7 +43,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/mail/protocols/webdav/build.gradle
+++ b/mail/protocols/webdav/build.gradle
@ -48,7 +48,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }
--- a/mail/testing/build.gradle
+++ b/mail/testing/build.gradle
@ -27,7 +27,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
    }
 }