Configure android extensions in subprojects

thunderbird · Dec 7, 2022 · be9b4ef · be9b4ef
1 parent 6c887d0
commit be9b4ef
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 309 deletions.
diff --git a/app/autodiscovery/providersxml/build.gradle b/app/autodiscovery/providersxml/build.gradle
@@ -22,32 +22,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.autodiscovery.providersxml'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
diff --git a/app/core/build.gradle b/app/core/build.gradle
@@ -44,32 +44,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.core'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
diff --git a/app/crypto-openpgp/build.gradle b/app/crypto-openpgp/build.gradle
@@ -10,25 +10,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.crypto.openpgp'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
 }
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
@@ -44,9 +44,6 @@ dependencies {
 android {
     namespace 'com.fsck.k9'
 
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
     defaultConfig {
         applicationId "com.fsck.k9"
         testApplicationId "com.fsck.k9.tests"
@@ -59,13 +56,6 @@ android {
                 "hr", "is", "it", "lv", "lt", "hu", "nl", "nb", "pl", "pt_PT", "pt_BR", "ru", "ro", "sq", "sk", "sl",
                 "fi", "sv", "tr", "el", "be", "bg", "sr", "uk", "iw", "ar", "fa", "ml", "ko", "zh_CN", "zh_TW", "ja",
                 "fy"
-
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.targetSdk
-
-        vectorDrawables.useSupportLibrary = true
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -108,11 +98,6 @@ android {
 
     lintOptions {
         checkDependencies true
-
-        // Do not abort build if lint finds errors
-        abortOnError false
-
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
     }
 
     packagingOptions {
@@ -135,21 +120,6 @@ android {
         includeInApk = false
         includeInBundle = false
     }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
 
 if (project.hasProperty('keyAlias')) {

diff --git a/app/storage/build.gradle b/app/storage/build.gradle
@@ -25,32 +25,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.storage'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
diff --git a/app/testing/build.gradle b/app/testing/build.gradle
@@ -13,26 +13,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.testing'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
 }
diff --git a/app/ui/base/build.gradle b/app/ui/base/build.gradle
@@ -19,26 +19,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.ui.base'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
 }
diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle
@@ -72,14 +72,6 @@ dependencies {
 android {
     namespace 'com.fsck.k9.ui'
 
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
     buildTypes {
         debug {
             def useNewSetupUi = project.hasProperty('k9mail.useNewSetupUi') ? project.property('k9mail.useNewSetupUi') : "false"
@@ -93,24 +85,4 @@ android {
             manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
         }
     }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
diff --git a/app/ui/message-list-widget/build.gradle b/app/ui/message-list-widget/build.gradle
@@ -11,14 +11,6 @@ dependencies {
 android {
     namespace 'app.k9mail.ui.widget.list'
 
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
     buildTypes {
         debug {
             manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
@@ -27,18 +19,4 @@ android {
             manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
         }
     }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
 }
diff --git a/app/ui/setup/build.gradle b/app/ui/setup/build.gradle
@@ -28,32 +28,4 @@ dependencies {
 
 android {
     namespace 'com.fsck.k9.ui.setup'
-
-    compileSdkVersion buildConfig.compileSdk
-    buildToolsVersion buildConfig.buildTools
-
-    defaultConfig {
-        minSdkVersion buildConfig.minSdk
-        targetSdkVersion buildConfig.robolectricSdk
-    }
-
-    lintOptions {
-        abortOnError false
-        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
-    }
-
-    compileOptions {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
-    }
-
-    kotlinOptions {
-        jvmTarget = kotlinJvmVersion
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,9 @@
+import com.android.build.gradle.BasePlugin
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 
 buildscript {
     ext {
         buildConfig = [
-                'compileSdk': 33,
-                'targetSdk': 31,
-                'minSdk': 21,
-                'buildTools': '32.0.0',
                 'robolectricSdk': 31
         ]
 
@@ -112,6 +109,36 @@ subprojects {
         }
     }
 
+    plugins.withType(BasePlugin).configureEach {
+        project.android {
+            compileSdk 33
+
+            defaultConfig {
+                minSdk 21
+                targetSdk 31
+
+                vectorDrawables.useSupportLibrary = true
+                testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+            }
+
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_1_8
+                targetCompatibility JavaVersion.VERSION_1_8
+            }
+
+            lintOptions {
+                abortOnError false
+                lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+            }
+
+            testOptions {
+                unitTests {
+                    includeAndroidResources = true
+                }
+            }
+        }
+    }
+
     tasks.withType(Test) {
         testLogging {
             exceptionFormat "full"