Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Finalize bump agp 9.0 (enable newDsl) (#2054)

Jaehwa Noheee94e4b7df6
diff --git a/app/README.md b/app/README.md
index cbcdc35be..bc2e9cb41 100644
--- a/app/README.md
+++ b/app/README.md
@@ -54,7 +54,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
diff --git a/benchmarks/README.md b/benchmarks/README.md
index c2bbf2a2a..14218e6f2 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -54,7 +54,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
diff --git a/core/data-test/README.md b/core/data-test/README.md
index b36f5b66d..4bad1f06c 100644
--- a/core/data-test/README.md
+++ b/core/data-test/README.md
@@ -19,7 +19,7 @@ graph TB
:core:data-test[data-test]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
:core:notifications[notifications]:::android-library
diff --git a/core/data/README.md b/core/data/README.md
index 0b84940d2..0c8732a25 100644
--- a/core/data/README.md
+++ b/core/data/README.md
@@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
:core:notifications[notifications]:::android-library
diff --git a/core/datastore-proto/README.md b/core/datastore-proto/README.md
index 859e39756..80c4ce5b6 100644
--- a/core/datastore-proto/README.md
+++ b/core/datastore-proto/README.md
@@ -13,7 +13,7 @@ config:
graph TB
subgraph :core
direction TB
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
end
classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
diff --git a/core/datastore-proto/build.gradle.kts b/core/datastore-proto/build.gradle.kts
index be7a16d46..67e9bed02 100644
--- a/core/datastore-proto/build.gradle.kts
+++ b/core/datastore-proto/build.gradle.kts
@@ -15,23 +15,19 @@
*/
plugins {
- alias(libs.plugins.nowinandroid.android.library)
+ alias(libs.plugins.nowinandroid.jvm.library)
alias(libs.plugins.protobuf)
}
-android {
- namespace = "com.google.samples.apps.nowinandroid.core.datastore.proto"
-}
-
// Setup protobuf configuration, generating lite Java and Kotlin classes
protobuf {
protoc {
artifact = libs.protobuf.protoc.get().toString()
}
generateProtoTasks {
- all().forEach { task ->
- task.builtins {
- register("java") {
+ all().configureEach {
+ builtins {
+ named("java") {
option("lite")
}
register("kotlin") {
diff --git a/core/datastore-test/README.md b/core/datastore-test/README.md
index 6de8718e8..1cafe7df8 100644
--- a/core/datastore-test/README.md
+++ b/core/datastore-test/README.md
@@ -15,7 +15,7 @@ graph TB
direction TB
:core:common[common]:::jvm-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:datastore-test[datastore-test]:::android-library
:core:model[model]:::jvm-library
end
diff --git a/core/datastore/README.md b/core/datastore/README.md
index 744f60f43..752be7c38 100644
--- a/core/datastore/README.md
+++ b/core/datastore/README.md
@@ -15,7 +15,7 @@ graph TB
direction TB
:core:common[common]:::jvm-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
end
diff --git a/core/domain/README.md b/core/domain/README.md
index b23877337..742246fd7 100644
--- a/core/domain/README.md
+++ b/core/domain/README.md
@@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
diff --git a/core/testing/README.md b/core/testing/README.md
index d5925b1a5..06dea09e7 100644
--- a/core/testing/README.md
+++ b/core/testing/README.md
@@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
:core:notifications[notifications]:::android-library
diff --git a/feature/bookmarks/impl/README.md b/feature/bookmarks/impl/README.md
index 123a842f6..3b98afadd 100644
--- a/feature/bookmarks/impl/README.md
+++ b/feature/bookmarks/impl/README.md
@@ -30,7 +30,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:model[model]:::jvm-library
:core:navigation[navigation]:::android-library
diff --git a/feature/foryou/impl/README.md b/feature/foryou/impl/README.md
index 8c12460f4..85d7b30d9 100644
--- a/feature/foryou/impl/README.md
+++ b/feature/foryou/impl/README.md
@@ -30,7 +30,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
diff --git a/feature/search/api/README.md b/feature/search/api/README.md
index a468f649d..866e3f6fc 100644
--- a/feature/search/api/README.md
+++ b/feature/search/api/README.md
@@ -25,7 +25,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
:core:navigation[navigation]:::android-library
diff --git a/feature/search/impl/README.md b/feature/search/impl/README.md
index 04800005c..4d0852ec4 100644
--- a/feature/search/impl/README.md
+++ b/feature/search/impl/README.md
@@ -34,7 +34,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library
:core:model[model]:::jvm-library
diff --git a/feature/settings/impl/README.md b/feature/settings/impl/README.md
index 88aadd960..1b8e0754f 100644
--- a/feature/settings/impl/README.md
+++ b/feature/settings/impl/README.md
@@ -25,7 +25,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:designsystem[designsystem]:::android-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
diff --git a/gradle.properties b/gradle.properties
index 2ad031065..2e9d9fc30 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,3 @@ roborazzi.test.verify=true
# Prevent uninstall app after instrumented tests
# https://issuetracker.google.com/issues/295039976
android.injected.androidTest.leaveApksInstalledAfterRun=true
-
-# Blockers:
-# - https://github.com/google/protobuf-gradle-plugin/issues/787
-android.newDsl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c98b1b454..f6dd9379d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ kotlinxSerializationJson = "1.8.0"
ksp = "2.3.4"
okhttp = "4.12.0"
protobuf = "4.29.2"
-protobufPlugin = "0.9.5"
+protobufPlugin = "0.9.6"
retrofit = "2.11.0"
retrofitKotlinxSerializationJson = "1.0.0"
robolectric = "4.16"
diff --git a/sync/sync-test/README.md b/sync/sync-test/README.md
index 601724ef7..2a01cb9c6 100644
--- a/sync/sync-test/README.md
+++ b/sync/sync-test/README.md
@@ -23,7 +23,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
:core:notifications[notifications]:::android-library
diff --git a/sync/work/README.md b/sync/work/README.md
index fab74f33c..f73de371c 100644
--- a/sync/work/README.md
+++ b/sync/work/README.md
@@ -22,7 +22,7 @@ graph TB
:core:data[data]:::android-library
:core:database[database]:::android-library
:core:datastore[datastore]:::android-library
- :core:datastore-proto[datastore-proto]:::android-library
+ :core:datastore-proto[datastore-proto]:::jvm-library
:core:model[model]:::jvm-library
:core:network[network]:::android-library
:core:notifications[notifications]:::android-library