Merge pull request #119 from imashnake0/project-accessors

Type-safe project accessors
imashnake0 · Jan 17, 2024 · 60f117e · 60f117e
2 parents a4d772a + b1dbc77
commit 60f117e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 45 deletions.
diff --git a/api/anilist/build.gradle.kts b/api/anilist/build.gradle.kts
@@ -7,10 +7,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -26,7 +22,7 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":api:preferences"))
+    implementation(projects.api.preferences)
 
     // Apollo Kotlin
     implementation(libs.apollo.runtime)

diff --git a/api/preferences/build.gradle.kts b/api/preferences/build.gradle.kts
@@ -6,10 +6,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,6 @@ android {
         applicationId = "com.imashnake.animite"
         versionCode = 8
         versionName = "0.0.1-alpha08"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -63,11 +61,11 @@ ksp {
 }
 
 dependencies {
-    implementation(project(":api:anilist"))
-    implementation(project(":core"))
-    implementation(project(":profile"))
-    implementation(project(":rslash"))
-    implementation(project(":material-color-utilities"))
+    implementation(projects.api.anilist)
+    implementation(projects.core)
+    implementation(projects.profile)
+    implementation(projects.rslash)
+    implementation(projects.materialColorUtilities)
 
     // AndroidX
     implementation(libs.androidx.activityCompose)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -4,10 +4,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,13 +17,13 @@ desugaring = "2.0.4"
 
 # Android Gradle Plugin
 # https://developer.android.com/studio/releases/gradle-plugin.
-agp = "8.2.0"
+agp = "8.2.1"
 
 # AndroidX
 # https://androidx.tech.
 activity = "1.8.2"
-core = "1.13.0-alpha02"
-lifecycle = "2.7.0-rc02"
+core = "1.13.0-alpha03"
+lifecycle = "2.7.0"
 extJunit = "1.2.0-alpha02"
 espresso = "3.6.0-alpha02"
 
@@ -42,17 +42,17 @@ coil = "2.5.0"
 
 # Compose Destinations
 # https://github.com/raamcosta/compose-destinations/releases.
-composeDestinations = "1.9.55"
+composeDestinations = "1.9.59"
 
 # Compose
 # https://developer.android.com/jetpack/androidx/releases/compose.
-composeAnimation = "1.6.0-beta03"
-composeCompiler = "1.5.7"
-composeFoundation = "1.6.0-beta03"
-composeMaterial = "1.6.0-beta03"
-composeMaterial3 = "1.2.0-beta01"
-composeRuntime = "1.6.0-beta03"
-composeUi = "1.6.0-beta03"
+composeAnimation = "1.6.0-rc01"
+composeCompiler = "1.5.8"
+composeFoundation = "1.6.0-rc01"
+composeMaterial = "1.6.0-rc01"
+composeMaterial3 = "1.2.0-beta02"
+composeRuntime = "1.6.0-rc01"
+composeUi = "1.6.0-rc01"
 
 # Dagger
 # https://github.com/google/dagger/releases.
@@ -64,12 +64,12 @@ hilt = "1.1.0"
 
 # Kotlin
 # https://kotlinlang.org/docs/releases.html#release-details.
-kotlin = "1.9.21"
+kotlin = "1.9.22"
 coroutines = "1.8.0-RC2"
 
 # KSP
 # https://github.com/google/ksp/releases.
-ksp = "1.9.21-1.0.16"
+ksp = "1.9.22-1.0.16"
 
 # Test
 # https://github.com/junit-team/junit4/releases.

diff --git a/profile/build.gradle.kts b/profile/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -37,9 +33,9 @@ ksp {
 }
 
 dependencies {
-    implementation(project(":core"))
-    implementation(project(":api:anilist"))
-    implementation(project(":api:preferences"))
+    implementation(projects.core)
+    implementation(projects.api.anilist)
+    implementation(projects.api.preferences)
 
     // AndroidX
     implementation(libs.androidx.activityCompose)

diff --git a/rslash/build.gradle.kts b/rslash/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -37,7 +33,7 @@ ksp {
 }
 
 dependencies {
-    implementation(project(":core"))
+    implementation(projects.core)
 
     // AndroidX
     implementation(libs.androidx.activityCompose)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,7 @@
 @file:Suppress("UnstableApiUsage")
+
 import com.android.build.api.dsl.SettingsExtension
+import org.gradle.api.internal.FeaturePreviews
 
 pluginManagement {
     repositories {
@@ -37,3 +39,5 @@ configure<SettingsExtension> {
     compileSdk = 34
     minSdk = 29
 }
+
+enableFeaturePreview(FeaturePreviews.Feature.TYPESAFE_PROJECT_ACCESSORS.name)