From a30e493081fa3f2ca60059c5089b249e7c436746 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Fri, 9 Feb 2024 10:20:32 -0500
Subject: [PATCH] build: revert gradle changes to address deprecation warnings
 for Gradle 9

causing a weird property-named directory to be created in model/

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
---
 build.gradle.kts                       |  2 +-
 buildSrc/src/main/java/Dependencies.kt |  2 ++
 model/build.gradle                     | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bebac1bab..8f27c2ed4 100644
--- a/build.gradle.kts
+++ b/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)
     }
 }
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index bfbaf5383..7689ee09e 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/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.+"
diff --git a/model/build.gradle b/model/build.gradle
index 7ee186e35..a8a13e934 100644
--- a/model/build.gradle
+++ b/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