Clean up the bumped SDK/Java versions (#452)

Solarisbank · Jan 11, 2024 · 770a7c0 · 770a7c0
1 parent f74c690
commit 770a7c0
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 34 deletions.
diff --git a/bank/build.gradle b/bank/build.gradle
@@ -16,8 +16,15 @@ android {
         test.java.srcDirs += ["${project(':core').projectDir}/src/test/java"]
     }
     defaultConfig {
-        minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
+        gradle.startParameter.taskNames.each {
+            if (it.contains("AndroidTest")) {
+                //io.mockk has a bug that does not allow use a version of minSdk less than 26
+                minSdkVersion buildConfig.androidTestMinSdk
+            } else {
+                minSdkVersion buildConfig.minSdk
+            }
+        }
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -45,12 +52,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {

diff --git a/buildsystem/config.gradle b/buildsystem/config.gradle
@@ -1,8 +1,11 @@
 ext {
     buildConfig = [
             compileSdk: 34,
-            minSdk: 26,
+            minSdk: 23,
+            androidTestMinSdk: 26,
             targetSdk: 33,
+            jvmTarget: '17',
+            javaVersion: JavaVersion.VERSION_17
     ]
     libConfig = [
             resourcePrefix: 'identhub_'

diff --git a/core/build.gradle b/core/build.gradle
@@ -45,12 +45,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {

diff --git a/example/build.gradle b/example/build.gradle
@@ -54,23 +54,29 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = buildConfig.jvmTarget
     }
 }
 
 dependencies {
+    implementation project(path: ':bank')
+    implementation project(path: ':fourthline')
+    implementation project(path: ':qes')
+    implementation project(path: ':startup')
+    implementation project(path: ':session')
+    implementation project(path: ':mockro')
+
     implementation timber
     implementation kotlinCore
     implementation support
     implementation activity
     implementation fragment
     implementation lifecycle.libs
     implementation koin
-    implementation project(path: ':bank')
-    implementation project(path: ':fourthline')
-    implementation project(path: ':qes')
-    implementation project(path: ':startup')
-    implementation project(path: ':session')
-    implementation project(path: ':mockro')
+
 }
diff --git a/fourthline/build.gradle b/fourthline/build.gradle
@@ -35,12 +35,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {

diff --git a/mockro/build.gradle b/mockro/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'de.solarisbank.identhub.mockro'
-    compileSdk 33
+    compileSdk buildConfig.compileSdk
 
     defaultConfig {
-        minSdk 26
-        targetSdk 33
+        minSdk buildConfig.minSdk
+        targetSdk buildConfig.targetSdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -21,12 +21,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
+
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 }
 

diff --git a/qes/build.gradle b/qes/build.gradle
@@ -25,12 +25,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {

diff --git a/session/build.gradle b/session/build.gradle
@@ -32,12 +32,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {

diff --git a/startup/build.gradle b/startup/build.gradle
@@ -25,12 +25,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility buildConfig.javaVersion
+        targetCompatibility buildConfig.javaVersion
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = buildConfig.jvmTarget
     }
 
     testOptions {