Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Update Java grpc metadata for new staging structure #1265

Merged
merged 4 commits into from
May 19, 2017
Merged

Update Java grpc metadata for new staging structure #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58a159a
Remove staging build file
shinfan May 19, 2017
a9ab4d9
Address PR feedback
shinfan May 19, 2017
3d2aaf2
Update tests
shinfan May 19, 2017
7184161
Minor fix
shinfan May 19, 2017
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 .../java/com/google/api/codegen/grpcmetadatagen/java/JavaGrpcPackageMetadataTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class JavaGrpcPackageMetadataTransformer extends JavaPackageMetadataTrans
private final Map<String, String> snippetsOutput =
ImmutableMap.of(
"LICENSE.snip", "LICENSE",
"metadatagen/java/grpc/package.snip", "build.gradle");
"metadatagen/java/grpc/build.gradle.snip", "build.gradle");

@Override
protected Map<String, String> getSnippetsOutput() {
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/google/api/codegen/grpcmetadatagen/java/JavaProtoPackageMetadataTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class JavaProtoPackageMetadataTransformer extends JavaPackageMetadataTran
private final Map<String, String> snippetsOutput =
ImmutableMap.of(
"LICENSE.snip", "LICENSE",
"metadatagen/java/grpc/package.snip", "build.gradle");
"metadatagen/java/grpc/build.gradle.snip", "build.gradle");

@Override
protected Map<String, String> getSnippetsOutput() {
Expand Down
7 changes: 4 additions & 3 deletions ...odegen/metadatagen/java/grpc/package.snip → ...n/metadatagen/java/grpc/build.gradle.snip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
tasks.uploadArchives.dependsOn(failUploadArchives)
}

task checkOutGhPages {
task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
exec {
commandLine 'git', 'clone', '--branch', 'gh-pages',
Expand Down Expand Up @@ -152,6 +152,7 @@
task updateDocsWithCurrentVersion {
dependsOn 'createApiDocsRedirect'
}

@end

@private dependencies(metadata)
Expand All @@ -161,12 +162,12 @@
compile "com.google.protobuf:protobuf-java:{@metadata.protoVersionBound.lower}"
compile "com.google.api:api-common:{@metadata.apiCommonVersionBound.lower}"
@join dependency : metadata.protoPackageDependencies
compile "com.google.api.grpc:{@dependency.name}:{@dependency.versionBound.lower}"
compile project(":{@dependency.name}")
@end
@case "GRPC"
compile "io.grpc:grpc-stub:{@metadata.grpcVersionBound.lower}"
compile "io.grpc:grpc-protobuf:{@metadata.grpcVersionBound.lower}"
compile "com.google.api.grpc:{@metadata.protoPackageName}:{@metadata.packageVersionBound.lower}"
compile project(":{@metadata.protoPackageName}")
@default
$unhandledCase: {@metadata.generationLayer}$
@end
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_common_protos.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
tasks.uploadArchives.dependsOn(failUploadArchives)
}

task checkOutGhPages {
task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
exec {
commandLine 'git', 'clone', '--branch', 'gh-pages',
Expand Down Expand Up @@ -358,3 +358,4 @@ task createApiDocsRedirect {
task updateDocsWithCurrentVersion {
dependsOn 'createApiDocsRedirect'
}

5 changes: 3 additions & 2 deletions src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_grpc_stubs.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ repositories {
dependencies {
compile "io.grpc:grpc-stub:1.0.1"
compile "io.grpc:grpc-protobuf:1.0.1"
compile "com.google.api.grpc:proto-google-cloud-library-v1:0.1.7"
compile project(":proto-google-cloud-library-v1")
}

ext {
Expand Down Expand Up @@ -312,7 +312,7 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
tasks.uploadArchives.dependsOn(failUploadArchives)
}

task checkOutGhPages {
task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
exec {
commandLine 'git', 'clone', '--branch', 'gh-pages',
Expand Down Expand Up @@ -359,3 +359,4 @@ task createApiDocsRedirect {
task updateDocsWithCurrentVersion {
dependsOn 'createApiDocsRedirect'
}

7 changes: 4 additions & 3 deletions src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ repositories {
dependencies {
compile "com.google.protobuf:protobuf-java:3.0.0"
compile "com.google.api:api-common:0.0.2"
compile "com.google.api.grpc:proto-google-common-protos:0.1.6"
compile "com.google.api.grpc:proto-google-some-other-package-v1:0.0.0"
compile project(":proto-google-common-protos")
compile project(":proto-google-some-other-package-v1")
}

ext {
Expand Down Expand Up @@ -313,7 +313,7 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
tasks.uploadArchives.dependsOn(failUploadArchives)
}

task checkOutGhPages {
task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
exec {
commandLine 'git', 'clone', '--branch', 'gh-pages',
Expand Down Expand Up @@ -360,3 +360,4 @@ task createApiDocsRedirect {
task updateDocsWithCurrentVersion {
dependsOn 'createApiDocsRedirect'
}