update to AGP 7.4.2

nicklasl · Dec 22, 2023 · 6c3bf5a · 6c3bf5a
1 parent 33d0e37
commit 6c3bf5a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,12 +8,12 @@ plugins {
 val composeVersion: String by project
 
 android {
-    compileSdk = 31
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "nu.nldv.santareporter"
         minSdk = 24
-        targetSdk = 31
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
 
@@ -64,7 +64,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = "1.8"
-        useIR = true
     }
     buildFeatures {
         compose = true
@@ -77,6 +76,7 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    namespace = "nu.nldv.santareporter"
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="nu.nldv.santareporter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/nu/nldv/santareporter/MainActivity.kt b/app/src/main/java/nu/nldv/santareporter/MainActivity.kt
@@ -65,7 +65,7 @@ class MainActivity : ComponentActivity() {
                     isFloatingActionButtonDocked = true,
                     bottomBar = { BottomBar(vm) }
                 ) {
-                    Surface {
+                    Surface(modifier = Modifier.padding(it)) {
                         val uiStateValue = uiState.value
                         Background()
                         Box(

diff --git a/app/src/test/kotlin/nu/nldv/santareporter/CoroutinesTestRule.kt b/app/src/test/kotlin/nu/nldv/santareporter/CoroutinesTestRule.kt
@@ -1,16 +1,17 @@
 package nu.nldv.santareporter
 
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 
 @ExperimentalCoroutinesApi
 class CoroutinesTestRule(
-    val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
+    val testDispatcher: CoroutineDispatcher = UnconfinedTestDispatcher()
 ) : TestWatcher() {
 
     override fun starting(description: Description?) {
@@ -21,6 +22,5 @@ class CoroutinesTestRule(
     override fun finished(description: Description?) {
         super.finished(description)
         Dispatchers.resetMain()
-        testDispatcher.cleanupTestCoroutines()
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,9 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.4")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1")
+        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-composeVersion=1.0.1
+composeVersion=1.2.0-rc02
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
		distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip