Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Feb 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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.+"
Expand Down
10 changes: 5 additions & 5 deletions model/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -41,7 +41,7 @@ sourceSets.main {
}

compileJava {
options.generatedSourceOutputDirectory.set(generatedSrcRoot)
options.annotationProcessorGeneratedSourcesDirectory generatedSrcRoot
}

protobuf {
Expand Down Expand Up @@ -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
Expand Down