Skip to content

Commit 234c38c

Browse files
chingor13elharo
chingor13
and
elharo
authored
feat: configure initial sp version (#1796)
* feat: configure initial sp version * build: update protobuf plugin (#1770) @Neenu1995 @chingor13 unbreak build Co-authored-by: Elliotte Rusty Harold <[email protected]>
1 parent 180c37a commit 234c38c

File tree

4 files changed

+99
-90
lines changed

4 files changed

+99
-90
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 93 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,119 @@
1-
on:
1+
'on':
22
push:
33
branches:
4-
- master
5-
pull_request:
4+
- 1.31.3-sp
5+
pull_request: null
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 8, 11]
12+
java:
13+
- 7
14+
- 8
15+
- 11
1316
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-java@v1
16-
with:
17-
java-version: ${{matrix.java}}
18-
- run: java -version
19-
- run: .kokoro/install_dependencies.sh
20-
- run: .kokoro/build.sh
21-
env:
22-
JOB_TYPE: test
23-
- name: coverage
24-
uses: codecov/codecov-action@v1
25-
with:
26-
name: actions ${{matrix.java}}
17+
- uses: actions/checkout@v2
18+
- uses: actions/setup-java@v1
19+
with:
20+
java-version: ${{matrix.java}}
21+
- run: java -version
22+
- run: .kokoro/install_dependencies.sh
23+
- run: .kokoro/build.sh
24+
env:
25+
JOB_TYPE: test
26+
- name: coverage
27+
uses: codecov/codecov-action@v1
28+
with:
29+
name: actions ${{matrix.java}}
2730
windows:
2831
runs-on: windows-latest
2932
steps:
30-
- name: git configuration to avoid automatic CRLF conversion
31-
run: |
32-
git config --global core.autocrlf false
33-
git config --global core.eol lf
34-
- uses: actions/checkout@v2
35-
- uses: actions/setup-java@v1
36-
with:
37-
java-version: 8
38-
- run: java -version
39-
- name: Install google-play-services artifact
40-
shell: bash
41-
run: |
42-
mkdir play-services
43-
cd play-services
44-
curl --output play-services-basement-8.3.0.aar https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar
45-
unzip play-services-basement-8.3.0.aar
46-
mvn install:install-file \
47-
-Dfile=classes.jar \
48-
-DgroupId=com.google.android.google-play-services \
49-
-DartifactId=google-play-services \
50-
-Dversion=1 \
51-
-Dpackaging=jar
52-
- run: .kokoro/build.sh
53-
shell: bash
54-
env:
55-
JOB_TYPE: test
33+
- name: git configuration to avoid automatic CRLF conversion
34+
run: |
35+
git config --global core.autocrlf false
36+
git config --global core.eol lf
37+
- uses: actions/checkout@v2
38+
- uses: actions/setup-java@v1
39+
with:
40+
java-version: 8
41+
- run: java -version
42+
- name: Install google-play-services artifact
43+
shell: bash
44+
run: >
45+
mkdir play-services
46+
47+
cd play-services
48+
49+
curl --output play-services-basement-8.3.0.aar
50+
https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar
51+
52+
unzip play-services-basement-8.3.0.aar
53+
54+
mvn install:install-file \
55+
-Dfile=classes.jar \
56+
-DgroupId=com.google.android.google-play-services \
57+
-DartifactId=google-play-services \
58+
-Dversion=1 \
59+
-Dpackaging=jar
60+
- run: .kokoro/build.sh
61+
shell: bash
62+
env:
63+
JOB_TYPE: test
5664
dependencies:
5765
runs-on: ubuntu-latest
5866
strategy:
5967
matrix:
60-
java: [8, 11]
68+
java:
69+
- 8
70+
- 11
6171
steps:
62-
- uses: actions/checkout@v2
63-
- uses: actions/setup-java@v1
64-
with:
65-
java-version: ${{matrix.java}}
66-
- run: java -version
67-
- run: .kokoro/install_dependencies.sh
68-
- run: .kokoro/dependencies.sh
72+
- uses: actions/checkout@v2
73+
- uses: actions/setup-java@v1
74+
with:
75+
java-version: ${{matrix.java}}
76+
- run: java -version
77+
- run: .kokoro/install_dependencies.sh
78+
- run: .kokoro/dependencies.sh
6979
linkage-monitor:
7080
runs-on: ubuntu-latest
7181
steps:
72-
- uses: actions/checkout@v2
73-
- uses: actions/setup-java@v1
74-
with:
75-
java-version: 8
76-
- run: java -version
77-
- run: .kokoro/install_dependencies.sh
78-
- name: Install artifacts to local Maven repository
79-
run: .kokoro/build.sh
80-
shell: bash
81-
- name: Validate dependencies with regard to com.google.cloud:libraries-bom (latest release)
82-
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
82+
- uses: actions/checkout@v2
83+
- uses: actions/setup-java@v1
84+
with:
85+
java-version: 8
86+
- run: java -version
87+
- run: .kokoro/install_dependencies.sh
88+
- name: Install artifacts to local Maven repository
89+
run: .kokoro/build.sh
90+
shell: bash
91+
- name: >-
92+
Validate dependencies with regard to com.google.cloud:libraries-bom
93+
(latest release)
94+
uses: >-
95+
GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
8396
lint:
8497
runs-on: ubuntu-latest
8598
steps:
86-
- uses: actions/checkout@v2
87-
- uses: actions/setup-java@v1
88-
with:
89-
java-version: 11
90-
- run: java -version
91-
- run: .kokoro/install_dependencies.sh
92-
- run: .kokoro/build.sh
93-
env:
94-
JOB_TYPE: lint
99+
- uses: actions/checkout@v2
100+
- uses: actions/setup-java@v1
101+
with:
102+
java-version: 11
103+
- run: java -version
104+
- run: .kokoro/install_dependencies.sh
105+
- run: .kokoro/build.sh
106+
env:
107+
JOB_TYPE: lint
95108
clirr:
96109
runs-on: ubuntu-latest
97110
steps:
98-
- uses: actions/checkout@v2
99-
- uses: actions/setup-java@v1
100-
with:
101-
java-version: 8
102-
- run: java -version
103-
- run: .kokoro/install_dependencies.sh
104-
- run: .kokoro/build.sh
105-
env:
106-
JOB_TYPE: clirr
111+
- uses: actions/checkout@v2
112+
- uses: actions/setup-java@v1
113+
with:
114+
java-version: 8
115+
- run: java -version
116+
- run: .kokoro/install_dependencies.sh
117+
- run: .kokoro/build.sh
118+
env:
119+
JOB_TYPE: clirr

‎google-api-client-protobuf/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
</executions>
7878
</plugin>
7979
<plugin>
80-
<groupId>com.google.protobuf.tools</groupId>
81-
<artifactId>maven-protoc-plugin</artifactId>
82-
<version>0.4.2</version>
80+
<groupId>org.xolstice.maven.plugins</groupId>
81+
<artifactId>protobuf-maven-plugin</artifactId>
82+
<version>0.6.1</version>
8383
<configuration>
8484
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
8585
</configuration>

‎google-api-client/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
</executions>
9191
</plugin>
9292
<plugin>
93-
<groupId>com.google.protobuf.tools</groupId>
94-
<artifactId>maven-protoc-plugin</artifactId>
95-
<version>0.4.2</version>
93+
<groupId>org.xolstice.maven.plugins</groupId>
94+
<artifactId>protobuf-maven-plugin</artifactId>
95+
<version>0.6.1</version>
9696
<configuration>
9797
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
9898
</configuration>

‎pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
<name>Central Repository</name>
7979
<url>https://repo.maven.apache.org/maven2</url>
8080
</pluginRepository>
81-
<pluginRepository>
82-
<id>protoc-plugin</id>
83-
<url>https://dl.bintray.com/sergei-ivanov/maven/</url>
84-
</pluginRepository>
8581
</pluginRepositories>
8682

8783
<dependencyManagement>

0 commit comments

Comments
 (0)