Implements the most of the changes for 0.5.0 #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Require the user to apply either the java plugin or the android plugin first, so that he has a choice between them. Resolves #11
…ted before afterEvaluate
…for both Java and android
|
|
||
| // You need to build the https://github.com/grpc/grpc-java | ||
| // to obtain these libraries below. | ||
| compile 'io.grpc:grpc-core:0.1.0-SNAPSHOT' |
…tion of tasks in the tests and fixed found issues; Use released version of grpc
… right before executing the java compilation task. Otherwise incremental build will break.
…t/tested as long as install is not in the command line
- Add ofTest() and ofNonTest() selectors;
- Move the linking of generateProto tasks and javaCompile tasks (adding
task dependency, and adding generated source dirs to javaCompile's
input) to right after the execution of generateProtoTasks
configuration closure, because alternative locations won't work well:
1. At the beginning of the generateProto task. In incremental builds,
the generateProto task may be skipped because proto files are not
changed, but we still want to add the generated files dirs to
the javaCompile task.
2. In project.gradle.taskGraph.beforeTask. Android plugin doesn't
allow calling variant.registerJavaGeneratingTask() at this point,
i.e., in the task execution phase.
Caveat: if the user configure tasks in their own project.afterEvaluate
closure, e.g., adding a new builtin/plugin, it won't be included in
the javaCompile inputs. So, user has to configure tasks in
protobuf.generateProtoTasks.
- Add more test cases.
…enerateProtoTasks block
|
|
||
| /** | ||
| * Returns the conventional substring that represents the sourceSet in task names, | ||
| * e.g., "generate<sourceSetStubString>Proto" |
|
@zhangkun83, some comments, but LGTM |
zhangkun83
added a commit
that referenced
this pull request
Jun 25, 2015
Implements the most of the changes for 0.5.0
podarsmarty
pushed a commit
to podarsmarty/protobuf-gradle-plugin
that referenced
this pull request
Jul 22, 2016
* added network manager, added location manager, changed main activity to have a simple map fragment, and waith until map is ready and location is ready before init. * changed mapfragment back and used location manager in map wrapper fragment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
android.sourceSetswill have theprotoextension for customizing proto source directories/files, just like what the top-levelsourceSetsdoes. (Does not work with android plugin #11)generate*Prototask (implemented byGenerateProtoTask) for eachvariantin Android projects. (Does not work with android plugin #11)protobufblock (implemented byProtobufConfigurator) with more Gradlely syntax. (Organize the options better #14, generatedFileDir does not follow Gradle Java Plugin conventions (nor can you) #16)generate*Prototasks instead of insourceSets. We provide convenient helpersprotobuf.generateProtoTasksfor users to configure a certain subset of tasks at a time.extractedProtosDiroption is removed, because the user should not really care about it."$buildDir/generated/source/proto/$sourceSet/$name", where$namecould bejava,pythonetc. The basedir i.e.$buildDir/generated/source/proto/is configurable throughprotobuf.generatedFilesBaseDir(Setting an output directory #13, generatedFileDir does not follow Gradle Java Plugin conventions (nor can you) #16)Design doc is here.
@ejona86 please review
@madongfly please help verify the Android support works