Updated Gradle to 8.5

JackEblan · Dec 3, 2023 · da9bc6d · da9bc6d
1 parent e198f1a
commit da9bc6d
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 55 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,6 +22,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
+            isShrinkResources = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
@@ -36,17 +37,17 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:designsystem"))
-    implementation(project(":feature:userapplist"))
-    implementation(project(":feature:userappsettings"))
+    implementation(projects.core.common)
+    implementation(projects.core.designsystem)
+    implementation(projects.feature.userapplist)
+    implementation(projects.feature.userappsettings)
 
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.compose)
 
-    androidTestImplementation(project(":core:testing"))
-    testImplementation(project(":core:testing"))
+    androidTestImplementation(projects.core.testing)
+    testImplementation(projects.core.testing)
 
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.coroutines.android)

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
 }
 
 android {

diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -1,22 +1,16 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
 }
 
 android {
     namespace = "com.core.data"
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:database"))
-    implementation(project(":core:domain"))
-    implementation(project(":core:model"))
-    implementation(project(":core:testing"))
+    implementation(projects.core.common)
+    implementation(projects.core.database)
+    implementation(projects.core.domain)
+    implementation(projects.core.model)
+    implementation(projects.core.testing)
 }
diff --git a/core/data/src/test/kotlin/com/core/data/repository/SettingsRepositoryImplTest.kt b/core/data/src/test/kotlin/com/core/data/repository/SettingsRepositoryImplTest.kt
@@ -5,7 +5,6 @@ import android.provider.Settings
 import com.core.domain.repository.SettingsRepository
 import com.core.model.SettingsType
 import com.core.model.UserAppSettingsItem
-import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -21,6 +20,7 @@ import org.mockito.Mock
 import org.mockito.MockedStatic
 import org.mockito.Mockito.mockStatic
 import org.mockito.junit.MockitoJUnitRunner
+import kotlin.test.assertNotNull
 
 @RunWith(MockitoJUnitRunner::class)
 class SettingsRepositoryImplTest {
@@ -90,7 +90,7 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.applySettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 
 
@@ -118,7 +118,7 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.applySettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 
 
@@ -146,7 +146,7 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.applySettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 
     @Test
@@ -173,7 +173,7 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.revertSettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 
     @Test
@@ -200,7 +200,7 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.revertSettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 
 
@@ -228,6 +228,6 @@ class SettingsRepositoryImplTest {
 
         val result = settingsRepository.revertSettings(userAppSettingsItemList).getOrNull()
 
-        assertThat(result).isNotNull()
+        assertNotNull(result)
     }
 }
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
-    id("com.android.geto.room")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
+    alias(libs.plugins.com.android.geto.room)
 }
 
 android {
@@ -13,5 +13,5 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:model"))
+    implementation(projects.core.model)
 }
diff --git a/core/database/src/androidTest/kotlin/com/core/database/dao/UserAppSettingsDaoTest.kt b/core/database/src/androidTest/kotlin/com/core/database/dao/UserAppSettingsDaoTest.kt
@@ -64,6 +64,7 @@ class UserAppSettingsDaoTest {
         val userAppSettingsList =
             userAppSettingsDao.getUserAppSettingsList("com.android.geto").first()
 
-        assertEquals(listOf("com.android.geto"), userAppSettingsList.map { it.packageName })
+        assertEquals(expected = listOf("com.android.geto"),
+                     actual = userAppSettingsList.map { it.packageName })
     }
 }
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.com.android.geto.library)
     alias(libs.plugins.com.android.geto.library.compose)

diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
 }
 
 android {
     namespace = "com.core.domain"
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 }
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-    id("com.android.geto.jvm.library")
+    alias(libs.plugins.com.android.geto.jvm.library)
 }
diff --git a/core/systemmanagers/build.gradle.kts b/core/systemmanagers/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
 }
 
 android {
     namespace = "com.core.systemmanagers"
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 }
diff --git a/...rs/src/test/kotlin/com/core/systemmanagers/packagemanager/PackageManagerHelperImplTest.kt b/...rs/src/test/kotlin/com/core/systemmanagers/packagemanager/PackageManagerHelperImplTest.kt
@@ -2,7 +2,6 @@ package com.core.systemmanagers.packagemanager
 
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
-import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -17,6 +16,7 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import java.io.ByteArrayOutputStream
+import kotlin.test.assertEquals
 
 @RunWith(MockitoJUnitRunner::class)
 class PackageManagerHelperImplTest {
@@ -60,6 +60,6 @@ class PackageManagerHelperImplTest {
     @Test
     fun `filter non-system apps, return true if the applicationInfoList is not empty`() =
         runTest(testDispatcher) {
-            assertThat(mockPackageManagerHelperImpl.getNonSystemAppList()).isNotEmpty()
+            assertEquals(expected = true, actual = mockPackageManagerHelperImpl.getNonSystemAppList().isNotEmpty())
         }
 }
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.geto.library")
-    id("com.android.geto.hilt")
+    alias(libs.plugins.com.android.geto.library)
+    alias(libs.plugins.com.android.geto.hilt)
 }
 
 android {
@@ -19,6 +19,4 @@ dependencies {
     api(libs.mockito.core)
     api(libs.mockito.kotlin)
     api(libs.mockito.inline)
-    api(libs.truth)
-    api(libs.robolectric)
 }
diff --git a/feature/userapplist/build.gradle.kts b/feature/userapplist/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    id("com.android.geto.feature")
+    alias(libs.plugins.com.android.geto.feature)
 }
 
 android {
     namespace = "com.feature.userapplist"
 }
 
 dependencies {
-    implementation(project(":core:systemmanagers"))
+    implementation(projects.core.systemmanagers)
 }
diff --git a/feature/userappsettings/build.gradle.kts b/feature/userappsettings/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.geto.feature")
+    alias(libs.plugins.com.android.geto.feature)
 }
 
 android {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -110,6 +110,7 @@ com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp_v
 com-android-geto-application = { id = "com.android.geto.application", version = "unspecified" }
 com-android-geto-application-compose = { id = "com.android.geto.application.compose", version = "unspecified" }
 com-android-geto-library = { id = "com.android.geto.library", version = "unspecified" }
+com-android-geto-jvm-library = { id = "com.android.geto.jvm.library", version = "unspecified" }
 com-android-geto-library-compose = { id = "com.android.geto.library.compose", version = "unspecified" }
 com-android-geto-feature = { id = "com.android.geto.feature", version = "unspecified" }
 com-android-geto-hilt = { id = "com.android.geto.hilt", version = "unspecified" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 12 21:18:44 PST 2023
+#Sun Dec 03 12:17:48 PST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,6 +14,7 @@ dependencyResolutionManagement {
     }
 }
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "Geto"
 include(":app")
 include(":core:common")