Merge pull request #160 from code-payments/chore/tweak-proto-gradle-setup

Chore/tweak proto gradle setup

Author: bmc08gt

build.gradle.kts

@@ -17,6 +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")
     }
 }
 
@@ -33,5 +34,5 @@ allprojects {
 }
 
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }

fastlane/Fastfile

@@ -21,7 +21,7 @@ platform :android do
     gradle(task: "test")
   end
 
-  desc "Builld and Deploy a new version to the Google Play"
+  desc "Build and Deploy a new version to the Google Play"
   lane :deploy do
     #puts "Patch version for this build will be " + ENV["BUILD_NUMBER"]
     gradle(

model/build.gradle

@@ -1,23 +1,16 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
-apply plugin: "java-library"
-apply plugin: "com.google.protobuf"
-apply plugin: "maven-publish"
+plugins {
+    id 'java-library'
+    id 'com.google.protobuf'
+    id 'maven-publish'
+}
 
 def archSuffix = Os.isFamily(Os.FAMILY_MAC) ? ':osx-x86_64' : ''
 
 version = '0.0.1'
 group = 'com.codeinc.gen'
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
-    }
-}
-
 def grpcVersion = "1.49.0"
 def protocVersion = "3.12.0"
 dependencies {
@@ -30,14 +23,14 @@ dependencies {
 
     // Kotlin Generation
     implementation "io.grpc:grpc-kotlin-stub-lite:1.0.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
 }
 
-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")
+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")
 sourceSets.main {
     proto {
         srcDir "${rootDir}/model/proto"
@@ -48,7 +41,7 @@ sourceSets.main {
 }
 
 compileJava {
-    options.annotationProcessorGeneratedSourcesDirectory generatedSrcRoot
+    options.generatedSourceOutputDirectory.set(generatedSrcRoot)
 }
 
 protobuf {
@@ -94,7 +87,7 @@ jar {
     exclude "**/*agora*/**"
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     from sourceSets.main.allSource
     archiveClassifier = 'sources'
     from generatedSrcRoot, generatedSrcRoot2, generatedSrcRoot3