ci: installing google-play-services artifact for Windows (#1706)

* ci: installing google-play-services artifact for Windows * ci: trying Invoke-WebRequest * ci: cont line characters * ci: make mvn command in one line * ci: using Windows bash * ci: trying multi-line and shell for build.sh * ci: upgrading checkstyle dependency * ci: updating checkstyle version * ci: upgraded checkstyle version * ci: turning off auto-crlf conversion for checkout action * ci: cleanup suppressions file filter * ci: specifying file path that works both windows and unix
googleapis · Feb 12, 2021 · 60cce2a · 60cce2a
1 parent 922af40
commit 60cce2a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,12 +27,30 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
+    - name: git configuration to avoid automatic CRLF conversion
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
       with:
         java-version: 8
     - run: java -version
-    - run: .kokoro/build.bat
+    - name: Install google-play-services artifact
+      shell: bash
+      run: |
+        mkdir play-services
+        cd play-services
+        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
+        unzip play-services-basement-8.3.0.aar
+        mvn install:install-file \
+            -Dfile=classes.jar \
+            -DgroupId=com.google.android.google-play-services \
+            -DartifactId=google-play-services \
+            -Dversion=1 \
+            -Dpackaging=jar
+    - run: .kokoro/build.sh
+      shell: bash
       env:
         JOB_TYPE: test
   dependencies:

diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
@@ -4,13 +4,8 @@
      "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
 
 <suppressions>
-
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/appengine/subscriptions/package-info.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/subscriptions/NotificationHeaders.java"/>
+  <suppress checks="LineLength" files="com[/\\]google[/\\]api[/\\]client[/\\]googleapis[/\\]extensions[/\\]appengine[/\\]notifications[/\\]AppEngineNotificationServlet.java"/>
+  <suppress checks="LineLength" files="com[/\\]google[/\\]api[/\\]client[/\\]googleapis[/\\]extensions[/\\]servlet[/\\]notifications[/\\]NotificationServlet.java"/>
 
   <!-- Don't check JavaDoc on package-info. -->
   <suppress checks="JavadocStyleCheck" files="package-info.java"/>

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -72,12 +72,8 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <module name="JavadocMethod">
       <property name="scope" value="protected"/>
       <property name="severity" value="warning"/>
-      <property name="allowMissingJavadoc" value="true"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
-      <property name="allowUndeclaredRTE" value="true"/>
     </module>
 
     <module name="JavadocType">
@@ -183,22 +179,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     -->
 
-    <module name="LineLength">
-      <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
-      <property name="severity" value="error"/>
-
-      <!--
-        The default ignore pattern exempts the following elements:
-          - import statements
-          - long URLs inside comments
-      -->
-
-      <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
-    </module>
-
     <module name="LeftCurly">
       <!-- Checks for placement of the left curly brace ('{'). -->
       <property name="severity" value="warning"/>
@@ -316,7 +296,23 @@ page at http://checkstyle.sourceforge.net/config.html -->
       -->
       <property name="severity" value="warning"/>
     </module>
+  </module>
+
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+    <property name="severity" value="error"/>
+
+    <!--
+      The default ignore pattern exempts the following elements:
+        - import statements
+        - long URLs inside comments
+    -->
 
+    <property name="ignorePattern"
+      value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+      default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
   </module>
 </module>
 
diff --git a/pom.xml b/pom.xml
@@ -561,7 +561,7 @@
               <dependency>
                 <groupId>com.puppycrawl.tools</groupId>
                 <artifactId>checkstyle</artifactId>
-                <version>8.23</version>
+                <version>8.39</version>
               </dependency>
             </dependencies>
             <configuration>