Merge pull request #162 from code-payments/chore/protobuf-revert-gradle-deprecation-fixes

build: revert gradle changes to address deprecation warnings for Grad…

Author: bmc08gt

build.gradle.kts

@@ -17,7 +17,7 @@ buildscript {
         classpath(Classpath.firebase_perf)
         classpath(Classpath.secrets_gradle_plugin)
         classpath(Classpath.kotlin_serialization_plugin)
-        classpath("com.google.protobuf:protobuf-gradle-plugin:0.8.14")
+        classpath(Classpath.protobuf_plugin)
     }
 }
 

buildSrc/src/main/java/Dependencies.kt

@@ -70,6 +70,7 @@ object Versions {
     const val markwon = "4.6.2"
     const val timber = "5.0.1"
     const val voyager = "1.0.0"
+    const val protobuf_plugin = "0.8.14"
 }
 
 object Classpath {
@@ -79,6 +80,7 @@ object Classpath {
     const val kotlin_gradle_plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val kotlin_serialization_plugin = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
     const val google_services = "com.google.gms:google-services:${Versions.google_services}"
+    const val protobuf_plugin = "com.google.protobuf:protobuf-gradle-plugin:${Versions.protobuf_plugin}"
 
     const val crashlytics_gradle = "com.google.firebase:firebase-crashlytics-gradle:${Versions.crashlytics_gradle}"
     const val bugsnag = "com.bugsnag:bugsnag-android-gradle-plugin:8.+"

model/build.gradle

@@ -28,9 +28,9 @@ dependencies {
 
 }
 
-def generatedSrcRoot = file("${layout.buildDirectory}/generated/source/proto/main/java")
-def generatedSrcRoot2 = file("${layout.buildDirectory}/generated/source/proto/main/grpc")
-def generatedSrcRoot3 = file("${layout.buildDirectory}/generated/source/proto/main/grpcKt")
+def generatedSrcRoot = file("${buildDir}/generated/source/proto/main/java")
+def generatedSrcRoot2 = file("${buildDir}/generated/source/proto/main/grpc")
+def generatedSrcRoot3 = file("${buildDir}/generated/source/proto/main/grpcKt")
 sourceSets.main {
     proto {
         srcDir "${rootDir}/model/proto"
@@ -41,7 +41,7 @@ sourceSets.main {
 }
 
 compileJava {
-    options.generatedSourceOutputDirectory.set(generatedSrcRoot)
+    options.annotationProcessorGeneratedSourcesDirectory generatedSrcRoot
 }
 
 protobuf {
@@ -87,7 +87,7 @@ jar {
     exclude "**/*agora*/**"
 }
 
-tasks.register('sourcesJar', Jar) {
+task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
     archiveClassifier = 'sources'
     from generatedSrcRoot, generatedSrcRoot2, generatedSrcRoot3