Remove redundant jvmTarget, targetCompatibility & sourceCompatibility specifications

Author: w2sv

app/build.gradle.kts

@@ -8,6 +8,10 @@ plugins {
     alias(libs.plugins.wifiwidget.hilt)
 }
 
+kotlin {
+    jvmToolchain(libs.versions.java.get().toInt())
+}
+
 android {
     val packageName = "com.w2sv.wifiwidget"
 
@@ -73,15 +77,6 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.java.get()
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     hilt {
         enableAggregatingTask = true  // Fixes warning
     }

plugins/build.gradle.kts

@@ -1,18 +1,7 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     `kotlin-dsl`
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-}
 kotlin {
     jvmToolchain {
         (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))

plugins/src/main/kotlin/BaseConfig.kt

@@ -1,39 +1,32 @@
+
 import com.android.build.gradle.BaseExtension
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.baseConfig() {
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_17.toString()
-        }
-    }
-    extensions.configure<KotlinProjectExtension> {
-        jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(libs.findVersionInt("java")))
+    with(extensions) {
+        configure<KotlinProjectExtension> {
+            jvmToolchain {
+                languageVersion.set(JavaLanguageVersion.of(libs.findVersionInt("java")))
+            }
         }
-    }
-    extensions.configure<BaseExtension> {
-        namespace = "com.w2sv." + path.removePrefix(":").replace(':', '.')
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
-        defaultConfig {
-            minSdk = libs.findVersionInt("minSdk")
-            targetSdk = libs.findVersionInt("compileSdk")
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        }
-        compileSdkVersion(libs.findVersionInt("compileSdk"))
-        testOptions {
-            unitTests.isReturnDefaultValues = true
-            animationsDisabled = true
-            unitTests.isIncludeAndroidResources = true
+        configure<BaseExtension> {
+            // Set namespace to com.w2sv.<module-name>
+            namespace = "com.w2sv." + path.removePrefix(":").replace(':', '.')
+
+            defaultConfig {
+                minSdk = libs.findVersionInt("minSdk")
+                targetSdk = libs.findVersionInt("compileSdk")
+                testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+            }
+            compileSdkVersion(libs.findVersionInt("compileSdk"))
+            testOptions {
+                unitTests.isReturnDefaultValues = true
+                animationsDisabled = true
+                unitTests.isIncludeAndroidResources = true
+            }
         }
     }
 }