chore: Standardise build.gradle.kts

Resolves: 10696
govuk-one-login · Dec 11, 2024 · 367a591 · 367a591
1 parent a272fc7
commit 367a591
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 48 deletions.
diff --git a/components/build.gradle.kts b/components/build.gradle.kts
@@ -19,6 +19,17 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        compose = true
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -80,24 +91,13 @@ android {
             isIncludeAndroidResources = true
         }
     }
-
-    buildFeatures {
-        compose = true
-    }
 }
 
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     androidTestImplementation(composeBom)
     implementation(composeBom)
 
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.androidx.compose.ui.junit4)
-    androidTestImplementation(libs.androidx.compose.ui.testmanifest)
-    androidTestImplementation(libs.androidx.test.espresso.core)
-
-    androidTestUtil(libs.androidx.test.orchestrator)
-
     implementation(libs.androidx.activity.compose)
     implementation(libs.appcompat)
     implementation(libs.material)
@@ -107,17 +107,18 @@ dependencies {
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.core.ktx)
-
     implementation(project(":theme"))
 
-    listOf(
-        libs.arch.core,
-        libs.hilt.android.testing,
-        libs.junit,
-        libs.mockito.kotlin
-    ).forEach { testDependency ->
-        testImplementation(testDependency)
-    }
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.compose.ui.junit4)
+    androidTestImplementation(libs.androidx.compose.ui.testmanifest)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestUtil(libs.androidx.test.orchestrator)
+
+    testImplementation(libs.arch.core)
+    testImplementation(libs.hilt.android.testing)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.kotlin)
 }
 
 mavenPublishingConfig {

diff --git a/pages/build.gradle.kts b/pages/build.gradle.kts
@@ -22,6 +22,13 @@ android {
     buildFeatures {
         compose = true
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     buildTypes {
         release {
@@ -66,6 +73,7 @@ android {
         xmlReport = true
     }
 
+    @Suppress("UnstableApiUsage")
     testOptions {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
         animationsDisabled = true
@@ -102,17 +110,12 @@ dependencies {
     androidTestImplementation(libs.androidx.compose.ui.junit4)
     androidTestImplementation(libs.androidx.compose.ui.testmanifest)
     androidTestImplementation(libs.androidx.test.espresso.core)
-
-    listOf(
-        libs.arch.core,
-        libs.hilt.android.testing,
-        libs.junit,
-        libs.mockito.kotlin
-    ).forEach { testDependency ->
-        testImplementation(testDependency)
-    }
-
     androidTestUtil(libs.androidx.test.orchestrator)
+
+    testImplementation(libs.arch.core)
+    testImplementation(libs.hilt.android.testing)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.kotlin)
 }
 
 mavenPublishingConfig {

diff --git a/theme/build.gradle.kts b/theme/build.gradle.kts
@@ -20,11 +20,12 @@ android {
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = (
-            rootProject.extra["composeKotlinCompilerVersion"] as String
-            )
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
     }
 
     buildTypes {
@@ -70,6 +71,7 @@ android {
         xmlReport = true
     }
 
+    @Suppress("UnstableApiUsage")
     testOptions {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
         animationsDisabled = true
@@ -88,10 +90,6 @@ android {
             isIncludeAndroidResources = true
         }
     }
-
-    buildFeatures {
-        compose = true
-    }
 }
 
 dependencies {
@@ -112,17 +110,12 @@ dependencies {
     androidTestImplementation(libs.androidx.compose.ui.junit4)
     androidTestImplementation(libs.androidx.compose.ui.testmanifest)
     androidTestImplementation(libs.androidx.test.espresso.core)
-
     androidTestUtil(libs.androidx.test.orchestrator)
 
-    listOf(
-        libs.arch.core,
-        libs.hilt.android.testing,
-        libs.junit.jupiter,
-        libs.mockito.kotlin
-    ).forEach { testDependency ->
-        testImplementation(testDependency)
-    }
+    testImplementation(libs.arch.core)
+    testImplementation(libs.hilt.android.testing)
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.mockito.kotlin)
     testImplementation(platform(libs.junit.bom))
 }