From befaa6cab44a75ab4019d0f97403bddfba9eacb7 Mon Sep 17 00:00:00 2001
From: Tom Tresansky <ttresansky@gradle.com>
Date: Thu, 16 May 2024 14:57:05 -0400
Subject: [PATCH 1/4] Remove unnecessary configuration from project DSLs

---
 core/common/build.gradle.dcl       | 8 --------
 core/data/build.gradle.dcl         | 6 ------
 core/domain/build.gradle.dcl       | 6 ------
 feature/bookmarks/build.gradle.dcl | 9 ++-------
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/core/common/build.gradle.dcl b/core/common/build.gradle.dcl
index 327be1a1b..41577c4c5 100644
--- a/core/common/build.gradle.dcl
+++ b/core/common/build.gradle.dcl
@@ -1,14 +1,6 @@
 androidLibrary {
     namespace = "com.google.samples.apps.nowinandroid.core.common"
 
-    buildTypes {
-        buildTypes {
-            // Need the empty closure to avoid "dangling pure expression" error
-            debug {}
-            release {}
-        }
-    }
-
     testing {
         dependencies {
             implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl
index 2ea4315e9..ccfd81bb9 100644
--- a/core/data/build.gradle.dcl
+++ b/core/data/build.gradle.dcl
@@ -16,12 +16,6 @@ androidLibrary {
         json()
     }
 
-    buildTypes {
-        // Need the empty closure to avoid "dangling pure expression" error
-        debug {}
-        release {}
-    }
-
     testing {
         dependencies {
             implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
diff --git a/core/domain/build.gradle.dcl b/core/domain/build.gradle.dcl
index bb32ab6de..7c05f6eff 100644
--- a/core/domain/build.gradle.dcl
+++ b/core/domain/build.gradle.dcl
@@ -8,12 +8,6 @@ androidLibrary {
         api(project(":core:model"))
     }
 
-    buildTypes {
-        // Need the empty closure to avoid "dangling pure expression" error
-        debug {}
-        release {}
-    }
-
     testing {
         dependencies {
             implementation(project(":core:testing"))
diff --git a/feature/bookmarks/build.gradle.dcl b/feature/bookmarks/build.gradle.dcl
index 991a08c17..8b17e66b0 100644
--- a/feature/bookmarks/build.gradle.dcl
+++ b/feature/bookmarks/build.gradle.dcl
@@ -5,13 +5,8 @@ androidLibrary {
         implementation(project(":core:data"))
     }
 
-    feature {
-        description = "Calling the configure method enables this lib to be treated as a feature"
-    }
-
-    compose {
-        description = "Calling the configure method enables compose support"
-    }
+    feature {}
+    compose {}
 
     testing {
         dependencies {

From ae5602da76e56685b00a8b7bc110c44a4496ff3e Mon Sep 17 00:00:00 2001
From: Tom Tresansky <ttresansky@gradle.com>
Date: Thu, 16 May 2024 15:23:52 -0400
Subject: [PATCH 2/4] Update how jsonSerialization is configured

---
 core/data/build.gradle.dcl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl
index ccfd81bb9..a8b503144 100644
--- a/core/data/build.gradle.dcl
+++ b/core/data/build.gradle.dcl
@@ -12,8 +12,7 @@ androidLibrary {
     }
 
     kotlinSerialization {
-        version = "1.6.3"
-        json()
+        jsonEnabled = true
     }
 
     testing {

From 17f5d6b72bda13319e6c52fc91f24f2765a2c745 Mon Sep 17 00:00:00 2001
From: Tom Tresansky <ttresansky@gradle.com>
Date: Thu, 16 May 2024 16:05:11 -0400
Subject: [PATCH 3/4] Make use of new hilt extension

---
 core/common/build.gradle.dcl | 2 ++
 core/data/build.gradle.dcl   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/common/build.gradle.dcl b/core/common/build.gradle.dcl
index 41577c4c5..3a0060cdb 100644
--- a/core/common/build.gradle.dcl
+++ b/core/common/build.gradle.dcl
@@ -1,6 +1,8 @@
 androidLibrary {
     namespace = "com.google.samples.apps.nowinandroid.core.common"
 
+    hilt {}
+
     testing {
         dependencies {
             implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl
index a8b503144..7a779feae 100644
--- a/core/data/build.gradle.dcl
+++ b/core/data/build.gradle.dcl
@@ -11,6 +11,8 @@ androidLibrary {
         implementation(project(":core:notifications"))
     }
 
+    hilt {}
+
     kotlinSerialization {
         jsonEnabled = true
     }

From 472042af210ac75fbdbb6dc711634c959fe6a653 Mon Sep 17 00:00:00 2001
From: Tom Tresansky <ttresansky@gradle.com>
Date: Thu, 16 May 2024 16:49:46 -0400
Subject: [PATCH 4/4] Update to use changes to Compose support

---
 feature/bookmarks/build.gradle.dcl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/feature/bookmarks/build.gradle.dcl b/feature/bookmarks/build.gradle.dcl
index 8b17e66b0..f5469ba54 100644
--- a/feature/bookmarks/build.gradle.dcl
+++ b/feature/bookmarks/build.gradle.dcl
@@ -6,7 +6,12 @@ androidLibrary {
     }
 
     feature {}
-    compose {}
+
+    compose {
+        // TODO: This should be a file property, and not assume it's a path from the root project
+        stabilityConfigurationFilePath = "/compose_compiler_config.conf"
+        experimentalStrongSkipping = true
+    }
 
     testing {
         dependencies {