Merge pull request #92 from azrael8576/chore/cleanup-dependencies

Remove unnecessary FlowPreview & RequiresOptIn opt-in

Author: azrael8576

app/build.gradle.kts

@@ -44,7 +44,10 @@ android {
         release {
             isMinifyEnabled = true
             applicationIdSuffix = AtBuildType.RELEASE.applicationIdSuffix
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
 
             // To publish on the Play store a private signing key is required, but to allow anyone
             // who clones the code to sign and run the release variant, use the debug signing key.
@@ -66,29 +69,36 @@ android {
 }
 
 dependencies {
-    implementation(project(":feature:login"))
-    implementation(project(":feature:teacherschedule"))
-    implementation(project(":feature:home"))
-    implementation(project(":feature:contactme"))
-
-    implementation(project(":core:designsystem"))
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:datastore"))
-
-    androidTestImplementation(project(":core:designsystem"))
-    androidTestImplementation(project(":core:datastore-test"))
-    androidTestImplementation(project(":core:testing"))
+    implementation(projects.feature.login)
+    implementation(projects.feature.teacherschedule)
+    implementation(projects.feature.home)
+    implementation(projects.feature.contactme)
+
+    implementation(projects.core.designsystem)
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.datastore)
+
+    androidTestImplementation(projects.core.designsystem)
+    androidTestImplementation(projects.core.datastoreTest)
+    androidTestImplementation(projects.core.testing)
+
     androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.accompanist.testharness)
-    testImplementation(project(":core:datastore-test"))
-    testImplementation(project(":core:testing"))
+
+    testImplementation(projects.core.datastoreTest)
+    testImplementation(projects.core.testing)
+
     testImplementation(libs.androidx.navigation.testing)
     testImplementation(libs.accompanist.testharness)
-    debugImplementation(project(":ui-test-hilt-manifest"))
+
+    debugImplementation(projects.uiTestHiltManifest)
+
     debugImplementation(libs.androidx.compose.ui.testManifest)
 
+    kspTest(libs.hilt.compiler)
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.activity.compose)
 
@@ -111,4 +121,4 @@ dependencies {
 
     // LeakCanary
     debugImplementation(libs.leakcanary)
-}
+}

build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt

@@ -14,8 +14,6 @@ class AndroidHiltConventionPlugin : Plugin<Project> {
             dependencies {
                 "implementation"(libs.findLibrary("hilt.android").get())
                 "ksp"(libs.findLibrary("hilt.compiler").get())
-                "kspAndroidTest"(libs.findLibrary("hilt.compiler").get())
-                "kspTest"(libs.findLibrary("hilt.compiler").get())
             }
         }
     }

build-logic/convention/src/main/kotlin/com/wei/amazingtalker/KotlinAndroid.kt

@@ -62,10 +62,8 @@ private fun Project.configureKotlin() {
             allWarningsAsErrors = warningsAsErrors.toBoolean()
             freeCompilerArgs = freeCompilerArgs +
                 listOf(
-                    "-opt-in=kotlin.RequiresOptIn",
                     // Enable experimental coroutines APIs, including Flow
                     "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                    "-opt-in=kotlinx.coroutines.FlowPreview",
                 )
         }
     }

core/common/build.gradle.kts

@@ -13,11 +13,11 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:model"))
+    implementation(projects.core.model)
 
     // LifeCycle
     implementation(libs.androidx.lifecycle.runtimeCompose)
 
     // Coroutines
     implementation(libs.kotlinx.coroutines.android)
-}
+}

core/data-test/build.gradle.kts

@@ -8,7 +8,7 @@ android {
 }
 
 dependencies {
-    api(project(":core:data"))
+    api(projects.core.data)
 
     implementation(libs.hilt.android.testing)
-}
+}

core/data/build.gradle.kts

@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:network"))
-    implementation(project(":core:model"))
-    implementation(project(":core:datastore"))
-}
+    implementation(projects.core.common)
+    implementation(projects.core.network)
+    implementation(projects.core.model)
+    implementation(projects.core.datastore)
+}

core/data/src/main/java/com/wei/amazingtalker/core/data/di/DataModule.kt

@@ -15,16 +15,18 @@ import dagger.hilt.components.SingletonComponent
 
 @Module
 @InstallIn(SingletonComponent::class)
-interface DataModule {
+abstract class DataModule {
     @Binds
-    fun bindsProfileRepository(profileRepository: FakeProfileRepository): ProfileRepository
+    internal abstract fun bindsProfileRepository(profileRepository: FakeProfileRepository): ProfileRepository
 
     @Binds
-    fun bindsTeacherScheduleRepository(teacherScheduleRepository: DefaultTeacherScheduleRepository): TeacherScheduleRepository
+    internal abstract fun bindsTeacherScheduleRepository(
+        teacherScheduleRepository: DefaultTeacherScheduleRepository,
+    ): TeacherScheduleRepository
 
     @Binds
-    fun bindsNetworkMonitor(networkMonitor: ConnectivityManagerNetworkMonitor): NetworkMonitor
+    internal abstract fun bindsNetworkMonitor(networkMonitor: ConnectivityManagerNetworkMonitor): NetworkMonitor
 
     @Binds
-    fun bindsUserDataRepository(userDataRepository: DefaultUserDataRepository): UserDataRepository
+    internal abstract fun bindsUserDataRepository(userDataRepository: DefaultUserDataRepository): UserDataRepository
 }

core/datastore-test/build.gradle.kts

@@ -9,14 +9,14 @@ android {
 }
 
 dependencies {
-    api(project(":core:datastore"))
-    implementation(project(":core:testing"))
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    api(projects.core.datastore)
+    implementation(projects.core.testing)
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 
     // DataStore
     implementation(libs.androidx.datastore)
 
     // Protobuf
     implementation(libs.protobuf.kotlin.lite)
-}
+}

core/datastore/build.gradle.kts

@@ -18,13 +18,13 @@ android {
 }
 
 dependencies {
-    api(project(":core:datastore-proto"))
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    api(projects.core.datastoreProto)
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 
     // DataStore
     implementation(libs.androidx.datastore)
 
     // Protobuf
     implementation(libs.protobuf.kotlin.lite)
-}
+}

core/designsystem/build.gradle.kts

@@ -13,7 +13,7 @@ android {
 }
 
 dependencies {
-    androidTestImplementation(project(":core:testing"))
+    androidTestImplementation(projects.core.testing)
 
     // Write trace events to the system trace buffer.
     api(libs.androidx.tracing.ktx)
@@ -48,4 +48,4 @@ dependencies {
     implementation(libs.coil.kt.svg)
     // kotlin datetime
     implementation(libs.kotlinx.datetime)
-}
+}

core/domain/build.gradle.kts

@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:network"))
-}
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.network)
+}

core/network/src/main/java/com/wei/amazingtalker/core/network/di/FlavoredNetworkModule.kt

@@ -12,7 +12,7 @@ import dagger.hilt.components.SingletonComponent
  */
 @Module
 @InstallIn(SingletonComponent::class)
-interface FlavoredNetworkModule {
+internal interface FlavoredNetworkModule {
     @Binds
     fun binds(implementation: RetrofitAtNetwork): AtNetworkDataSource
 }

core/network/src/main/java/com/wei/amazingtalker/core/network/di/NetworkModule.kt

@@ -13,7 +13,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object NetworkModule {
+internal object NetworkModule {
     @Provides
     @Singleton
     fun providesNetworkJson(): Json =

core/testing/build.gradle.kts

@@ -9,12 +9,12 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:domain"))
-    implementation(project(":core:network"))
-    implementation(project(":core:designsystem"))
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.domain)
+    implementation(projects.core.network)
+    implementation(projects.core.designsystem)
 
     api(libs.junit4)
     api(libs.androidx.activity.compose)

settings.gradle.kts

@@ -15,6 +15,8 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "amazingtalker"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include(":app")
 
 include(":core:network")