HMA-6361: update dependencies (#91)

* Update gradle plugin

* Update target/compile sdks, add compose bom

* Update compiler

* Update component dependencies

* Update compose

* Update changelog

* downgrade karumi shot

* Remove compose ui-test-junit4

* implement compose bom

* brackets

* Lint fixes

* downgrade karumi shot

* Update screenshots

* Update screenshot

Author: jemmaSlater

CHANGELOG.md

@@ -20,6 +20,31 @@ Allowed headings:
 
 * `DonutChartView` now supports three segments.
 
+### Changed
+
+The following libraries were updated:
+
+* `com.android.tools.build:gradle:`: `7.0.3` -> `7.3.1`
+* `org.jetbrains.kotlin:kotlin-gradle-plugin:`: `1.5.31` -> `1.7.20`
+* `targetSdk`: `30` -> `33`
+* `compileSdk`: `30` -> `33`
+* `buildTools`: `30.0.3` -> `33.0.1`
+
+* `androidx.annotation:annotation:`: `1.2.0` -> `1.5.0`
+* `androidx.appcompat:appcompat:`: `1.2.0` -> `1.5.1`
+* `androidx.recyclerview:recyclerview:`: `1.2.0` -> `1.2.1`
+* `androidx.constraintlayout:constraintlayout:`: `2.0.4` -> `2.1.4`
+* `androidx.lifecycle:lifecycle-common-java8:2.3.1`: removed
+* `androidx.lifecycle:lifecycle-compiler:2.5.1`: added
+* `androidx.core:core-ktx:`: `1.3.0` -> `1.9.0`
+* `androidx.test:core-ktx:`: `1.3.0` -> `1.5.0`
+* `androidx.test.ext:junit-ktx:`: `1.1.2` -> `1.1.5`
+* `androidx.test.espresso:espresso-core:`: `3.3.0` -> `3.5.1`
+* `androidx.test.espresso:espresso-contrib:`: `3.3.0` -> `3.5.1`
+* `androidx.test:runner:`: `1.3.0` -> `1.5.2`
+* `com.google.android.material:material:`: `1.3.0` -> `1.7.0`
+* `junit:junit:`: `4.13` -> `4.13.2`
+
 ## [4.3.2] - 2023-01-09
 
 ### Changed

build.gradle

@@ -1,8 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
-        kotlin_version = '1.5.31'
-    }
 
     repositories {
         google()
@@ -19,8 +16,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
         classpath "uk.gov.hmrc.gradle:spotless:1.1.1"
         classpath 'com.karumi:shot:5.7.0'
 

buildSrc/src/main/java/uk/gov/hmrc/components/buildsrc/ComposeDependencies.kt

@@ -18,29 +18,29 @@ package uk.gov.hmrc.components.buildsrc
 class ComposeDependencies {
     object Versions {
         const val minSdk = 23
-        const val targetSdk = 31
-        const val compileSdk = 31
-        const val compose = "1.0.5"
-        const val kotlinComposeCompiler = "1.5.21"
+        const val targetSdk = 33
+        const val compileSdk = 33
+        const val kotlinCompilerExtensionVersion = "1.3.2"
     }
 
     object Libs {
-        const val material = "com.google.android.material:material:1.4.0"
+        const val compose_bom = "androidx.compose:compose-bom:2022.12.00"
+        const val compose_foundation = "androidx.compose.foundation:foundation"
+        const val compose_material = "androidx.compose.material:material"
+        const val compose_tooling = "androidx.compose.ui:ui-tooling"
+        const val compose_ui = "androidx.compose.ui:ui"
+        const val compose_uiTest = "androidx.compose.ui:ui-test-junit4"
 
-        const val androidX_coreKtx = "androidx.core:core-ktx:1.7.0"
-        const val androidX_activity_activityCompose = "androidx.activity:activity-compose:1.4.0"
-        const val androidX_appCompat = "androidx.appcompat:appcompat:1.4.0"
+        const val material = "com.google.android.material:material:1.7.0"
 
-        const val androidX_compose_foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
-        const val androidX_compose_material = "androidx.compose.material:material:${Versions.compose}"
-        const val androidX_compose_tooling = "androidx.compose.ui:ui-tooling:${Versions.compose}"
-        const val androidX_compose_ui = "androidx.compose.ui:ui:${Versions.compose}"
-        const val androidX_compose_uiTest = "androidx.compose.ui:ui-test-junit4:${Versions.compose}"
+        const val androidX_activity_activityCompose = "androidx.activity:activity-compose:1.6.1"
+        const val androidX_appCompat = "androidx.appcompat:appcompat:1.5.1"
+        const val androidX_coreKtx = "androidx.core:core-ktx:1.9.0"
+        const val androidX_lifecycle_runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+        const val androidX_navigation_navigationCompose = "androidx.navigation:navigation-compose:2.5.3"
 
-        const val androidX_lifecycle_runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
-        const val androidX_navigation_navigationCompose = "androidx.navigation:navigation-compose:2.4.0-beta02"
-        const val androidX_test_ext_junit = "androidx.test.ext:junit-ktx:1.1.3"
-        const val androidX_test_espressoCore = "androidx.test.espresso:espresso-core:3.4.0"
+        const val androidX_test_ext_junit = "androidx.test.ext:junit-ktx:1.1.5"
+        const val androidX_test_espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
 
         const val junit = "junit:junit:4.13.2"
     }

buildSrc/src/main/java/uk/gov/hmrc/components/buildsrc/Dependencies.kt

@@ -18,30 +18,27 @@ package uk.gov.hmrc.components.buildsrc
 class Dependencies {
     object Versions {
         const val minSdk = 23
-        const val targetSdk = 30
-        const val compileSdk = 30
-        const val buildTools = "30.0.3"
-        const val kotlin = "1.5.31"
+        const val targetSdk = 33
+        const val compileSdk = 33
+        const val buildTools = "33.0.1"
     }
 
     object Libs {
-        const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
-
-        const val androidX_annotation = "androidx.annotation:annotation:1.2.0"
-        const val androidX_appcompat = "androidx.appcompat:appcompat:1.2.0"
-        const val androidX_recyclerview = "androidx.recyclerview:recyclerview:1.2.0"
-        const val androidX_constraintlayout = "androidx.constraintlayout:constraintlayout:2.0.4"
-        const val androidX_lifecycle = "androidx.lifecycle:lifecycle-common-java8:2.3.1"
-        const val androidX_core_ktx = "androidx.core:core-ktx:1.3.0"
-        const val androidX_test_core_ktx = "androidx.test:core-ktx:1.3.0"
-        const val androidX_test_ext_junit = "androidx.test.ext:junit-ktx:1.1.2"
-        const val androidX_test_espressoCore = "androidx.test.espresso:espresso-core:3.3.0"
-        const val androidX_test_espressoContrib = "androidx.test.espresso:espresso-contrib:3.3.0"
-        const val androidX_test_runner = "androidx.test:runner:1.3.0"
+        const val androidX_annotation = "androidx.annotation:annotation:1.5.0"
+        const val androidX_appcompat = "androidx.appcompat:appcompat:1.5.1"
+        const val androidX_recyclerview = "androidx.recyclerview:recyclerview:1.2.1"
+        const val androidX_constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
+        const val androidX_lifecycle = "androidx.lifecycle:lifecycle-compiler:2.5.1"
+        const val androidX_core_ktx = "androidx.core:core-ktx:1.9.0"
+        const val androidX_test_core_ktx = "androidx.test:core-ktx:1.5.0"
+        const val androidX_test_ext_junit = "androidx.test.ext:junit-ktx:1.1.5"
+        const val androidX_test_espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
+        const val androidX_test_espressoContrib = "androidx.test.espresso:espresso-contrib:3.5.1"
+        const val androidX_test_runner = "androidx.test:runner:1.5.2"
         const val androidX_test_uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
 
-        const val material = "com.google.android.material:material:1.3.0"
+        const val material = "com.google.android.material:material:1.7.0"
 
-        const val junit = "junit:junit:4.13"
+        const val junit = "junit:junit:4.13.2"
     }
 }

components-compose/build.gradle

@@ -7,7 +7,6 @@ plugins {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'uk.gov.hmrc.spotless'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 
@@ -22,8 +21,6 @@ android {
     defaultConfig {
         minSdk Versions.minSdk
         targetSdk Versions.targetSdk
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -48,21 +45,25 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Versions.compose
+        kotlinCompilerExtensionVersion Versions.kotlinCompilerExtensionVersion
     }
+    namespace 'uk.gov.hmrc.components.compose'
 }
 
 dependencies {
+    implementation platform(Libs.compose_bom)
+    androidTestImplementation platform(Libs.compose_bom)
+
     implementation Libs.androidX_coreKtx
-    implementation Libs.androidX_compose_ui
-    implementation Libs.androidX_compose_tooling
-    implementation Libs.androidX_compose_foundation
-    implementation Libs.androidX_compose_material
+    implementation Libs.compose_ui
+    implementation Libs.compose_tooling
+    implementation Libs.compose_foundation
+    implementation Libs.compose_material
 
     testImplementation Libs.junit
 
     // UI Tests
-    androidTestImplementation Libs.androidX_compose_uiTest
+    androidTestImplementation Libs.compose_uiTest
     androidTestImplementation Libs.androidX_test_ext_junit
     androidTestImplementation Libs.androidX_test_espressoCore
 }

components-compose/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="uk.gov.hmrc.components.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

components-test/build.gradle

@@ -6,7 +6,6 @@ plugins {
 }
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'uk.gov.hmrc.spotless'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 
@@ -27,8 +26,6 @@ android {
     defaultConfig {
         minSdkVersion Versions.minSdk
         targetSdkVersion Versions.targetSdk
-        versionCode 1
-        versionName version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -40,21 +37,21 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    lintOptions {
+    lint {
+        abortOnError true
+        baseline file('lint/baseline.xml')
         lintConfig file('lint/config.xml')
-        baseline file("lint/baseline.xml")
         warningsAsErrors true
-        abortOnError true
     }
+    namespace 'uk.gov.hmrc.components.test'
+
 
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':components')
 
-    implementation Libs.kotlin_stdlib
     implementation Libs.material
     implementation Libs.androidX_appcompat
     implementation Libs.androidX_core_ktx

components-test/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="uk.gov.hmrc.components.test" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

components/build.gradle

@@ -8,7 +8,6 @@ plugins {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'uk.gov.hmrc.spotless'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 
@@ -28,8 +27,6 @@ android {
     defaultConfig {
         minSdkVersion Versions.minSdk
         targetSdkVersion Versions.targetSdk
-        versionCode 1
-        versionName version
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
 
@@ -40,16 +37,17 @@ android {
         }
     }
 
-    lintOptions {
-        lintConfig file('lint/config.xml')
-        baseline file("lint/baseline.xml")
-        warningsAsErrors true
-        abortOnError true
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    lint {
+        abortOnError true
+        baseline file('lint/baseline.xml')
+        lintConfig file('lint/config.xml')
+        warningsAsErrors true
+    }
+    namespace 'uk.gov.hmrc.components'
 }
 
 
@@ -58,7 +56,6 @@ dependencies {
     implementation Libs.androidX_annotation
     implementation Libs.androidX_constraintlayout
     implementation Libs.androidX_core_ktx
-    implementation Libs.kotlin_stdlib
 
     testImplementation Libs.junit
 }

components/src/main/AndroidManifest.xml

@@ -14,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="uk.gov.hmrc.components"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:supportsRtl="true" />
 </manifest>