Fix gradle settings for java version based on project properties

Signed-off-by: Yurii Surzhykov <yuriisurzhykov@gmail.com>
yuriisurzhykov · May 27, 2024 · a503113 · a503113
1 parent fcc3366
commit a503113
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 49 deletions.
diff --git a/location-data/repository/build.gradle.kts b/location-data/repository/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 
 android {
     namespace = "com.github.yuriisurzhykov.purs.data.repository"
-    compileSdk = 34
+    compileSdk = ProjectProperties.compileSdkVersion
 
     defaultConfig {
-        minSdk = 24
+        minSdk = ProjectProperties.minSdkVersion
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = ProjectProperties.javaSourceCompatibility
+        targetCompatibility = ProjectProperties.javaTargetCompatibility
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = ProjectProperties.kotlinJvmTarget
     }
 }
 

diff --git a/...ndroidTest/java/com/github/yuriisurzhykov/purs/data/repository/ExampleInstrumentedTest.kt b/...ndroidTest/java/com/github/yuriisurzhykov/purs/data/repository/ExampleInstrumentedTest.kt
diff --git a/...ain/src/androidTest/java/com/github/yuriisurzhykov/purs/domain/ExampleInstrumentedTest.kt b/...ain/src/androidTest/java/com/github/yuriisurzhykov/purs/domain/ExampleInstrumentedTest.kt