-
Notifications
You must be signed in to change notification settings - Fork 274
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.
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
Wire proto sources/outputs/etc through ProtoSourceSet #632
Conversation
src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
Outdated
Show resolved
Hide resolved
src/test/groovy/com/google/protobuf/gradle/ProtobufKotlinDslPluginTest.groovy
Outdated
Show resolved
Hide resolved
src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
Outdated
Show resolved
Hide resolved
bd42d4c
to
83dbd91
Compare
293f152
to
4990241
Compare
Groovy type system problems
project, | ||
isTest, | ||
protoDir, | ||
protoDir.absolutePath.replace(project.rootDir.absolutePath, "").contains("build") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do better
project, | ||
isTest, | ||
protoDir, | ||
protoDir.absolutePath.replace(project.rootDir.absolutePath, "").contains("build") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do better
project, | ||
isTest, | ||
outputDir, | ||
outputDir.absolutePath.replace(project.rootDir.absolutePath, "").contains("build") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do better
private void configureAndroidKotlinCompileTasks(BaseVariant variant, ProtoSourceSet protoSourceSet) { | ||
project.plugins.withId("org.jetbrains.kotlin.android") { | ||
project.afterEvaluate { | ||
String compileKotlinTaskName = Utils.getKotlinAndroidCompileTaskName(project, variant.name) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getKotlinAndroidCompileTaskName can be moved to ProtoSourceSet
3080003
to
3196f30
Compare
See details here google#631
3196f30
to
7e4542a
Compare
Otherwise, gradle throw ClassNotFound exception
8a1ef8d
to
f100c02
Compare
.withPluginClasspath() | ||
.withGradleVersion(gradleVersion) | ||
.build() | ||
BuildResult result = ProtobufPluginTestHelper.getGradleRunner( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
move to separate PR
// https://github.com/gradle/gradle/issues/6862 | ||
//.withDebug(true) | ||
.build() | ||
BuildResult result = ProtobufPluginTestHelper.getGradleRunner( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
move to separate PR
import org.gradle.language.jvm.tasks.ProcessResources | ||
|
||
@CompileDynamic | ||
class AndroidExt { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add comment: Temporarily hack. TODO: Move all AndroidExt to AndroidProtobufPlugin
No description provided.