Skip to content

Chore/tweak proto gradle setup #160

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 2 commits into from
Feb 9, 2024
Merged

Chore/tweak proto gradle setup #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d213c63
chore: revert model proto dependency change
bmc08gt Feb 9, 2024
c5fcd65
fix: tweak proto setup to fix model generation
bmc08gt Feb 9, 2024
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
3 changes: 2 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand All @@ -33,5 +34,5 @@ allprojects {
}

tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
delete(rootProject.layout.buildDirectory)
}
2 changes: 1 addition & 1 deletion fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
29 changes: 11 additions & 18 deletions model/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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"
Expand All @@ -48,7 +41,7 @@ sourceSets.main {
}

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

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