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

* Bump protobufPlugin 0.9.6

Change-Id: I9f4174946f043c79bba9a669655f6654036b5679

* Change Android library to Jvm library.

Change-Id: I20ca1f71610f26a18d4573b3122994bc32c18723

* Enable newDsl.

Change-Id: Ifb855133593f64771e81f60b96c3e34d946dac8f

* Update README.

Change-Id: I3df518dd4a5f37ba7ca6e568914783b1ea417fce
pull/1807/merge
Jaehwa Noh 8 months ago committed by GitHub
parent 379956cb30
commit eee94e4b7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -54,7 +54,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library :core:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library

@ -54,7 +54,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library :core:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library

@ -19,7 +19,7 @@ graph TB
:core:data-test[data-test]:::android-library :core:data-test[data-test]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library
:core:notifications[notifications]:::android-library :core:notifications[notifications]:::android-library

@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library
:core:notifications[notifications]:::android-library :core:notifications[notifications]:::android-library

@ -13,7 +13,7 @@ config:
graph TB graph TB
subgraph :core subgraph :core
direction TB direction TB
:core:datastore-proto[datastore-proto]:::android-library :core:datastore-proto[datastore-proto]:::jvm-library
end end
classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000; classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;

@ -15,23 +15,19 @@
*/ */
plugins { plugins {
alias(libs.plugins.nowinandroid.android.library) alias(libs.plugins.nowinandroid.jvm.library)
alias(libs.plugins.protobuf) alias(libs.plugins.protobuf)
} }
android {
namespace = "com.google.samples.apps.nowinandroid.core.datastore.proto"
}
// Setup protobuf configuration, generating lite Java and Kotlin classes // Setup protobuf configuration, generating lite Java and Kotlin classes
protobuf { protobuf {
protoc { protoc {
artifact = libs.protobuf.protoc.get().toString() artifact = libs.protobuf.protoc.get().toString()
} }
generateProtoTasks { generateProtoTasks {
all().forEach { task -> all().configureEach {
task.builtins { builtins {
register("java") { named("java") {
option("lite") option("lite")
} }
register("kotlin") { register("kotlin") {

@ -15,7 +15,7 @@ graph TB
direction TB direction TB
:core:common[common]:::jvm-library :core:common[common]:::jvm-library
:core:datastore[datastore]:::android-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:datastore-test[datastore-test]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library
end end

@ -15,7 +15,7 @@ graph TB
direction TB direction TB
:core:common[common]:::jvm-library :core:common[common]:::jvm-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
end end

@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library

@ -18,7 +18,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library
:core:notifications[notifications]:::android-library :core:notifications[notifications]:::android-library

@ -30,7 +30,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library
:core:navigation[navigation]:::android-library :core:navigation[navigation]:::android-library

@ -30,7 +30,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library :core:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library

@ -25,7 +25,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library
:core:navigation[navigation]:::android-library :core:navigation[navigation]:::android-library

@ -34,7 +34,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:domain[domain]:::android-library :core:domain[domain]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library

@ -25,7 +25,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:designsystem[designsystem]:::android-library
:core:model[model]:::jvm-library :core:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library

@ -63,7 +63,3 @@ roborazzi.test.verify=true
# Prevent uninstall app after instrumented tests # Prevent uninstall app after instrumented tests
# https://issuetracker.google.com/issues/295039976 # https://issuetracker.google.com/issues/295039976
android.injected.androidTest.leaveApksInstalledAfterRun=true android.injected.androidTest.leaveApksInstalledAfterRun=true
# Blockers:
# - https://github.com/google/protobuf-gradle-plugin/issues/787
android.newDsl=false

@ -53,7 +53,7 @@ kotlinxSerializationJson = "1.8.0"
ksp = "2.3.4" ksp = "2.3.4"
okhttp = "4.12.0" okhttp = "4.12.0"
protobuf = "4.29.2" protobuf = "4.29.2"
protobufPlugin = "0.9.5" protobufPlugin = "0.9.6"
retrofit = "2.11.0" retrofit = "2.11.0"
retrofitKotlinxSerializationJson = "1.0.0" retrofitKotlinxSerializationJson = "1.0.0"
robolectric = "4.16" robolectric = "4.16"

@ -23,7 +23,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library
:core:notifications[notifications]:::android-library :core:notifications[notifications]:::android-library

@ -22,7 +22,7 @@ graph TB
:core:data[data]:::android-library :core:data[data]:::android-library
:core:database[database]:::android-library :core:database[database]:::android-library
:core:datastore[datastore]:::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:model[model]:::jvm-library
:core:network[network]:::android-library :core:network[network]:::android-library
:core:notifications[notifications]:::android-library :core:notifications[notifications]:::android-library

Loading…
Cancel
Save