Skip to content

Commit e57c45a

Browse files
bmc08gtbmc08gt
committed
build: update protobuf and grpc dependencies
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 4ae4c3d commit e57c45a

2 files changed

Lines changed: 70 additions & 43 deletions

File tree

‎buildSrc/src/main/java/Dependencies.kt‎

Lines changed: 62 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ object Versions {
3939
const val sqlcipher = "4.5.1@aar"
4040

4141
const val compose = "2024.05.00"
42+
4243
// compose compiler is tied to [Versions.kotlin]
4344
// See compatibility mapping here:
4445
// https://developer.android.com/jetpack/androidx/releases/compose-compiler
@@ -66,8 +67,10 @@ object Versions {
6667
const val play_service_auth = "20.7.0"
6768
const val play_service_auth_phone = "18.0.2"
6869

70+
const val grpc: String = "1.62.2"
6971
const val grpc_okhttp: String = "1.33.1"
70-
const val grpc_kotlin: String = "1.0.0"
72+
const val grpc_kotlin: String = "1.4.1"
73+
const val protobuf: String = "3.25.3"
7174

7275
const val mp_android_chart: String = "v3.1.0"
7376
const val lib_phone_number_port: String = "8.12.43"
@@ -84,24 +87,30 @@ object Versions {
8487
const val markwon = "4.6.2"
8588
const val timber = "5.0.1"
8689
const val voyager = "1.0.0"
87-
const val protobuf_plugin = "0.8.14"
90+
const val protobuf_plugin = "0.9.4"
8891

8992
const val sodium_bindings = "0.9.0"
9093
}
9194

9295
object Classpath {
93-
const val android_gradle_build_tools = "com.android.tools.build:gradle:${Versions.android_gradle_build_tools}"
96+
const val android_gradle_build_tools =
97+
"com.android.tools.build:gradle:${Versions.android_gradle_build_tools}"
9498
const val kotlin_hilt_plugin = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}"
95-
const val androidx_navigation_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"
99+
const val androidx_navigation_safeargs =
100+
"androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"
96101
const val kotlin_gradle_plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
97-
const val kotlin_serialization_plugin = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
102+
const val kotlin_serialization_plugin =
103+
"org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
98104
const val google_services = "com.google.gms:google-services:${Versions.google_services}"
99-
const val protobuf_plugin = "com.google.protobuf:protobuf-gradle-plugin:${Versions.protobuf_plugin}"
105+
const val protobuf_plugin =
106+
"com.google.protobuf:protobuf-gradle-plugin:${Versions.protobuf_plugin}"
100107

101-
const val crashlytics_gradle = "com.google.firebase:firebase-crashlytics-gradle:${Versions.crashlytics_gradle}"
108+
const val crashlytics_gradle =
109+
"com.google.firebase:firebase-crashlytics-gradle:${Versions.crashlytics_gradle}"
102110
const val bugsnag = "com.bugsnag:bugsnag-android-gradle-plugin:8.+"
103111
const val firebase_perf = "com.google.firebase:perf-plugin:1.4.2"
104-
const val secrets_gradle_plugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
112+
const val secrets_gradle_plugin =
113+
"com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
105114
const val versioning_gradle_plugin = "de.nanogiants:android-versioning:2.4.0"
106115
}
107116

@@ -118,7 +127,8 @@ object Plugins {
118127
const val firebase_crashlytics = "com.google.firebase.crashlytics"
119128
const val firebase_perf = "com.google.firebase.firebase-perf"
120129
const val bugsnag = "com.bugsnag.android.gradle"
121-
const val secrets_gradle_plugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin"
130+
const val secrets_gradle_plugin =
131+
"com.google.android.libraries.mapsplatform.secrets-gradle-plugin"
122132
const val versioning_gradle_plugin = "de.nanogiants.android-versioning"
123133
}
124134

@@ -128,9 +138,11 @@ object Libs {
128138
const val androidx_annotation = "androidx.annotation:annotation:${Versions.androidx_annotation}"
129139
const val androidx_biometrics = "androidx.biometric:biometric:${Versions.androidx_biometrics}"
130140
const val androidx_camerax_core = "androidx.camera:camera-core:${Versions.androidx_camerax}"
131-
const val androidx_camerax_camera2 = "androidx.camera:camera-camera2:${Versions.androidx_camerax}"
132-
const val androidx_camerax_lifecycle = "androidx.camera:camera-lifecycle:${Versions.androidx_camerax}"
133-
const val androidx_camerax_view = "androidx.camera:camera-view:${Versions.androidx_camerax}"
141+
const val androidx_camerax_camera2 =
142+
"androidx.camera:camera-camera2:${Versions.androidx_camerax}"
143+
const val androidx_camerax_lifecycle =
144+
"androidx.camera:camera-lifecycle:${Versions.androidx_camerax}"
145+
const val androidx_camerax_view = "androidx.camera:camera-view:${Versions.androidx_camerax}"
134146
const val androidx_core = "androidx.core:core-ktx:${Versions.androidx_core}"
135147
const val androidx_constraint_layout =
136148
"androidx.constraintlayout:constraintlayout:${Versions.androidx_constraint_layout}"
@@ -141,7 +153,8 @@ object Libs {
141153
const val androidx_navigation_ui =
142154
"androidx.navigation:navigation-ui-ktx:${Versions.androidx_navigation}"
143155
const val androidx_browser = "androidx.browser:browser:${Versions.androidx_browser}"
144-
const val androidx_paging_runtime = "androidx.paging:paging-runtime-ktx:${Versions.androidx_paging}"
156+
const val androidx_paging_runtime =
157+
"androidx.paging:paging-runtime-ktx:${Versions.androidx_paging}"
145158

146159
const val androidx_room_runtime = "androidx.room:room-runtime:${Versions.androidx_room}"
147160
const val androidx_room_rxjava3 = "androidx.room:room-rxjava3:${Versions.androidx_room}"
@@ -165,10 +178,14 @@ object Libs {
165178
"org.jetbrains.kotlinx:kotlinx-coroutines-rx3:${Versions.kotlinx_coroutines}"
166179
const val kotlinx_coroutines_test =
167180
"org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinx_coroutines}"
168-
const val kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6"
169-
const val kotlinx_datetime = "org.jetbrains.kotlinx:kotlinx-datetime:${Versions.kotlinx_datetime}"
170-
const val kotlinx_serialization_core = "org.jetbrains.kotlinx:kotlinx-serialization-core:${Versions.kotlinx_serialization}"
171-
const val kotlinx_serialization_json = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinx_serialization}"
181+
const val kotlinx_collections_immutable =
182+
"org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6"
183+
const val kotlinx_datetime =
184+
"org.jetbrains.kotlinx:kotlinx-datetime:${Versions.kotlinx_datetime}"
185+
const val kotlinx_serialization_core =
186+
"org.jetbrains.kotlinx:kotlinx-serialization-core:${Versions.kotlinx_serialization}"
187+
const val kotlinx_serialization_json =
188+
"org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinx_serialization}"
172189

173190
const val okhttp = "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
174191
const val okhttp_logging_interceptor =
@@ -177,7 +194,8 @@ object Libs {
177194
const val androidx_datastore = "androidx.datastore:datastore-preferences:1.1.1"
178195
const val androidx_constraint_layout_compose =
179196
"androidx.constraintlayout:constraintlayout-compose:1.0.1"
180-
const val androidx_lifecycle_viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidx_lifecycle}"
197+
const val androidx_lifecycle_viewmodel =
198+
"androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidx_lifecycle}"
181199

182200
const val compose_bom = "androidx.compose:compose-bom:${Versions.compose}"
183201
const val compose_accompanist =
@@ -190,7 +208,8 @@ object Libs {
190208
"androidx.compose.ui:ui-tooling-preview"
191209
const val compose_foundation = "androidx.compose.foundation:foundation"
192210
const val compose_material = "androidx.compose.material:material"
193-
const val compose_materialIconsExtended = "androidx.compose.material:material-icons-extended-android"
211+
const val compose_materialIconsExtended =
212+
"androidx.compose.material:material-icons-extended-android"
194213
const val compose_activities =
195214
"androidx.activity:activity-compose:${Versions.compose_activities}"
196215
const val compose_view_models =
@@ -199,10 +218,14 @@ object Libs {
199218
const val compose_navigation =
200219
"androidx.navigation:navigation-compose:${Versions.compose_navigation}"
201220
const val compose_paging = "androidx.paging:paging-compose:${Versions.compose_paging}"
202-
const val compose_voyager_navigation = "cafe.adriel.voyager:voyager-navigator:${Versions.voyager}"
203-
const val compose_voyager_navigation_hilt = "cafe.adriel.voyager:voyager-hilt:${Versions.voyager}"
204-
const val compose_voyager_navigation_bottomsheet = "cafe.adriel.voyager:voyager-bottom-sheet-navigator:${Versions.voyager}"
205-
const val compose_voyager_navigation_transitions = "cafe.adriel.voyager:voyager-transitions:${Versions.voyager}"
221+
const val compose_voyager_navigation =
222+
"cafe.adriel.voyager:voyager-navigator:${Versions.voyager}"
223+
const val compose_voyager_navigation_hilt =
224+
"cafe.adriel.voyager:voyager-hilt:${Versions.voyager}"
225+
const val compose_voyager_navigation_bottomsheet =
226+
"cafe.adriel.voyager:voyager-bottom-sheet-navigator:${Versions.voyager}"
227+
const val compose_voyager_navigation_transitions =
228+
"cafe.adriel.voyager:voyager-transitions:${Versions.voyager}"
206229
const val compose_webview = "io.github.kevinnzou:compose-webview:${Versions.compose_webview}"
207230

208231
const val rxjava = "io.reactivex.rxjava3:rxjava:${Versions.rxjava}"
@@ -220,17 +243,26 @@ object Libs {
220243
const val firebase_perf = "com.google.firebase:firebase-perf"
221244

222245
const val play_integrity = "com.google.android.play:integrity:1.3.0"
223-
const val play_service_auth = "com.google.android.gms:play-services-auth:${Versions.play_service_auth}"
224-
const val play_service_auth_phone = "com.google.android.gms:play-services-auth-api-phone:${Versions.play_service_auth_phone}"
246+
const val play_service_auth =
247+
"com.google.android.gms:play-services-auth:${Versions.play_service_auth}"
248+
const val play_service_auth_phone =
249+
"com.google.android.gms:play-services-auth-api-phone:${Versions.play_service_auth_phone}"
225250

226251
const val grpc_okhttp = "io.grpc:grpc-okhttp:${Versions.grpc_okhttp}"
227-
const val grpc_kotlin = "io.grpc:grpc-kotlin-stub-lite:${Versions.grpc_kotlin}"
252+
const val grpc_kotlin = "io.grpc:grpc-kotlin-stub:${Versions.grpc_kotlin}"
253+
const val grpc_protobuf = "io.grpc:grpc-protobuf:${Versions.grpc}"
254+
const val grpc_protobuf_lite = "io.grpc:grpc-protobuf-lite:${Versions.grpc}"
255+
const val grpc_stub = "io.grpc:grpc-stub:${Versions.grpc}"
256+
const val protobuf_java = "com.google.protobuf:protobuf-java:${Versions.protobuf}"
257+
const val protobuf_kotlin_lite = "com.google.protobuf:protobuf-kotlin-lite:${Versions.protobuf}"
228258

229259
const val inject = "javax.inject:javax.inject:1"
230260

231261
const val mp_android_chart = "com.github.PhilJay:MPAndroidChart:${Versions.mp_android_chart}"
232-
const val lib_phone_number_port = "io.michaelrocks:libphonenumber-android:${Versions.lib_phone_number_port}"
233-
const val lib_phone_number_google = "com.googlecode.libphonenumber:libphonenumber:${Versions.lib_phone_number_google}"
262+
const val lib_phone_number_port =
263+
"io.michaelrocks:libphonenumber-android:${Versions.lib_phone_number_port}"
264+
const val lib_phone_number_google =
265+
"com.googlecode.libphonenumber:libphonenumber:${Versions.lib_phone_number_google}"
234266
const val hilt_nav_compose = "androidx.hilt:hilt-navigation-compose:1.1.0-alpha01"
235267
const val zxing = "com.google.zxing:core:${Versions.zxing}"
236268

@@ -257,7 +289,8 @@ object Libs {
257289

258290
const val cloudy = "com.github.skydoves:cloudy:0.1.2"
259291

260-
const val sodium_bindings = "com.ionspin.kotlin:multiplatform-crypto-libsodium-bindings-android:${Versions.sodium_bindings}"
292+
const val sodium_bindings =
293+
"com.ionspin.kotlin:multiplatform-crypto-libsodium-bindings-android:${Versions.sodium_bindings}"
261294

262295
const val fingerprint_pro = "com.fingerprint.android:pro:2.4.0"
263296

‎model/build.gradle‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,14 @@ def archSuffix = Os.isFamily(Os.FAMILY_MAC) ? ':osx-x86_64' : ''
1111
version = '0.0.1'
1212
group = 'com.codeinc.gen'
1313

14-
def grpcVersion = "1.49.0"
15-
def protocVersion = "3.12.0"
1614
dependencies {
17-
implementation "io.grpc:grpc-protobuf-lite:$grpcVersion" // "io.grpc:grpc-protobuf-lite:${grpcVersion}"
18-
implementation "io.grpc:grpc-stub:$grpcVersion"
19-
// protobuf("io.envoyproxy.protoc-gen-validate:pgv-java-stub:${validateVersion}") {
20-
// exclude group: "com.google.protobuf", module: "protobuf-java"
21-
// exclude group: "com.google.protobuf", module: "protobuf-java-util"
22-
// }
15+
implementation(Libs.grpc_protobuf_lite)
16+
implementation(Libs.grpc_stub)
2317

2418
// Kotlin Generation
25-
implementation "io.grpc:grpc-kotlin-stub-lite:1.0.0"
26-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
27-
implementation 'javax.annotation:javax.annotation-api:1.3.2'
19+
implementation(Libs.grpc_kotlin)
20+
implementation(Libs.protobuf_kotlin_lite)
21+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
2822

2923
}
3024

@@ -46,11 +40,11 @@ compileJava {
4640

4741
protobuf {
4842
protoc {
49-
artifact = "com.google.protobuf:protoc:${protocVersion}$archSuffix"
43+
artifact = "com.google.protobuf:protoc:${Versions.protobuf}$archSuffix"
5044
}
5145
plugins {
5246
grpc {
53-
artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
47+
artifact = "io.grpc:protoc-gen-grpc-java:${Versions.grpc}"
5448
}
5549
// javapgv {
5650
// artifact = "io.envoyproxy.protoc-gen-validate:protoc-gen-validate:${validateVersion}"
@@ -101,4 +95,4 @@ artifacts {
10195
java {
10296
sourceCompatibility = JavaVersion.VERSION_1_8
10397
targetCompatibility = JavaVersion.VERSION_1_8
104-
}
98+
}

0 commit comments

Comments
 (0)