コミット: d8a2a23da4f357ab8ef87d6db111073696df1699 - HotshotLibgdx (git)

コミットメタ情報

• リビジョン: d8a2a23da4f357ab8ef87d6db111073696df1699 (tree)
• 日時: 2021-09-03 16:25:06
• 作者: SimonIT <simonit.orig@gmai...>
• コミッター: GitHub

ログメッセージ

Improve code formatting (#5698)

* basic spotless integration

* fix formatter path

* line endings lf and tabs for cpp

* Update spotless, format only diffs

* Exclude some folders from ignoring

* Add gwt files in webapp

* Fetch more git information in workflows

* Correct test index.html path

* Move spotless version to dependencies.gradle

変更サマリ

• modified: .github/workflows/build-pullrequest.yml
• modified: .github/workflows/build-snapshot.yml
• add: backends/gdx-backends-gwt/.gitignore
• modified: build.gradle
• add: extensions/gdx-setup/.gitignore
• modified: gradle/dependencies.gradle
• delete: tests/gdx-tests-gwt/{war => webapp}/WEB-INF/web.xml
• delete: tests/gdx-tests-gwt/{war => webapp}/index.html

差分

--- a/.github/workflows/build-pullrequest.yml
+++ b/.github/workflows/build-pullrequest.yml
@@ -11,6 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -30,9 +31,9 @@ jobs:
 
       - name: Build & test Java code
         run: |
-          ./gradlew fetchNatives build      
+          ./gradlew fetchNatives build
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
\ No newline at end of file
+          rm -f ~/.gradle/caches/modules-2/gc.properties

--- a/.github/workflows/build-snapshot.yml
+++ b/.github/workflows/build-snapshot.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   workflow_dispatch:
-    branches: [ master ]  
+    branches: [ master ]
 
 jobs:
 
@@ -13,6 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
@@ -49,24 +50,25 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: natives-ios.zip
-          path: natives-ios.zip           
+          path: natives-ios.zip
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
           rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  natives-macos:    
+  natives-macos:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'          
+          fetch-depth: 0
+          submodules: 'recursive'
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-          
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -96,18 +98,19 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: natives-macos.zip
-          path: natives-macos.zip                 
+          path: natives-macos.zip
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
           rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  natives-linux:    
+  natives-linux:
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -119,8 +122,8 @@ jobs:
         run: |
           sudo apt install -y --force-yes gcc g++
           sudo apt install -y --force-yes gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
-          sudo apt install -y --force-yes gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross                
-          
+          sudo apt install -y --force-yes gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -132,8 +135,8 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build Linux natives
-        run: |      
-          ./gradlew jniGen jnigenBuildLinux64 jnigenBuildLinuxARM jnigenBuildLinuxARM64      
+        run: |
+          ./gradlew jniGen jnigenBuildLinux64 jnigenBuildLinuxARM jnigenBuildLinuxARM64
 
       - name: Pack artifacts
         run: |
@@ -144,18 +147,19 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: natives-linux.zip
-          path: natives-linux.zip  
+          path: natives-linux.zip
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
           rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  natives-windows:    
+  natives-windows:
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -164,9 +168,9 @@ jobs:
           java-version: 1.8
 
       - name: Install cross-compilation toolchains
-        run: |          
-          sudo apt install -y --force-yes mingw-w64 lib32z1        
-          
+        run: |
+          sudo apt install -y --force-yes mingw-w64 lib32z1
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -178,8 +182,8 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build Windows natives
-        run: |          
-          ./gradlew jniGen jnigenBuildWindows64 jnigenBuildWindows      
+        run: |
+          ./gradlew jniGen jnigenBuildWindows64 jnigenBuildWindows
 
       - name: Pack artifacts
         run: |
@@ -190,25 +194,26 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: natives-windows.zip
-          path: natives-windows.zip  
+          path: natives-windows.zip
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
           rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  natives-android:    
+  natives-android:
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8                      
-          
+          java-version: 1.8
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -220,9 +225,9 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build Android natives
-        run: |          
+        run: |
           export NDK_HOME=$ANDROID_NDK_HOME
-          ./gradlew jniGen jnigenBuildAndroid      
+          ./gradlew jniGen jnigenBuildAndroid
 
       - name: Pack artifacts
         run: |
@@ -233,14 +238,14 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: natives-android.zip
-          path: natives-android.zip  
+          path: natives-android.zip
 
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties 
+          rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  pack-natives:    
+  pack-natives:
     runs-on: ubuntu-16.04
     needs: [natives-macos, natives-linux, natives-windows, natives-ios, natives-android]
     env:
@@ -249,6 +254,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -264,7 +270,7 @@ jobs:
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-      
+            ${{ runner.os }}-gradle-
 
       - name: Download natives-ios artifact
         uses: actions/download-artifact@v2
@@ -318,7 +324,7 @@ jobs:
           name: natives.zip
           path: natives.zip
 
-      - name: Upload artifacts to S3                  
+      - name: Upload artifacts to S3
         if: env.AWS_ACCESS_KEY_ID != null
         run: |
           aws s3 cp natives.zip s3://libgdx-nightlies/libgdx-nightlies/natives.zip
@@ -326,17 +332,18 @@ jobs:
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties 
+          rm -f ~/.gradle/caches/modules-2/gc.properties
 
-  release-snapshot:    
+  release-snapshot:
     runs-on: ubuntu-16.04
     needs: pack-natives
     env:
       MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-      MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}    
+      MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -346,7 +353,7 @@ jobs:
           server-id: sonatype-nexus-snapshots
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
-      
+
       - name: Cache Maven packages
         uses: actions/cache@v2
         with:
@@ -354,22 +361,22 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
-      - name: Download natives artifact        
+      - name: Download natives artifact
         uses: actions/download-artifact@v2
         with:
           name: natives.zip
 
-      - name: Unpack natives        
+      - name: Unpack natives
         run: |
           unzip -o natives.zip
 
       - name: Publish snapshot
         if: env.MAVEN_USERNAME != null
         run: |
-          mvn --batch-mode deploy        
-          
-          
-  build-and-upload-runnables:    
+          mvn --batch-mode deploy
+
+
+  build-and-upload-runnables:
     runs-on: ubuntu-16.04
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -377,6 +384,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: 0
           submodules: 'recursive'
 
       - name: Set up JDK 1.8
@@ -386,7 +394,7 @@ jobs:
       - name: Build Runnables
         run: ./gradlew clean fetchNatives buildRunnables extensions:gdx-setup:build
 
-      - name: Upload artifacts to S3                  
+      - name: Upload artifacts to S3
         if: env.AWS_ACCESS_KEY_ID != null
         run: |
           aws s3 cp ./extensions/gdx-tools/build/libs/ s3://libgdx-nightlies/libgdx-runnables/ --recursive

--- /dev/null
+++ b/backends/gdx-backends-gwt/.gitignore
@@ -0,0 +1 @@
+!/src/com/badlogic/gwtref/gen/

--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,18 @@
 
 apply from: "gradle/dependencies.gradle"
 
+buildscript {
+    apply from: "gradle/dependencies.gradle"
+
+    repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:${versions.spotless}"
+        classpath "com.badlogicgames.gdx:gdx-jnigen-gradle:2.2.0"
+    }
+}
+
 allprojects {
     group = 'com.badlogicgames.gdx'
     version = '1.10.0-SNAPSHOT'
@@ -29,9 +41,6 @@ allprojects {
             maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
             maven { url "https://oss.sonatype.org/content/repositories/releases/" }
         }
-        dependencies {
-            classpath "com.badlogicgames.gdx:gdx-jnigen-gradle:2.2.0"
-        }
     }
 
     repositories {
@@ -47,15 +56,42 @@ allprojects {
 configure(subprojects - project(":tests:gdx-tests-android")) {
     apply plugin: "idea"
     apply plugin: "java"
+    apply plugin: "com.diffplug.spotless"
 
     compileJava {
         options.fork = true
         options.incremental = true
     }
+
+    spotless {
+        ratchetFrom 'origin/master'
+
+        lineEndings 'UNIX'
+
+        java {
+            licenseHeader '/*******************************************************************************\n' +
+                    ' * Copyright 2011 See AUTHORS file.\n' +
+                    ' * \n' +
+                    ' * Licensed under the Apache License, Version 2.0 (the "License");\n' +
+                    ' * you may not use this file except in compliance with the License.\n' +
+                    ' * You may obtain a copy of the License at\n' +
+                    ' * \n' +
+                    ' *   http://www.apache.org/licenses/LICENSE-2.0\n' +
+                    ' * \n' +
+                    ' * Unless required by applicable law or agreed to in writing, software\n' +
+                    ' * distributed under the License is distributed on an "AS IS" BASIS,\n' +
+                    ' * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n' +
+                    ' * See the License for the specific language governing permissions and\n' +
+                    ' * limitations under the License.\n' +
+                    ' ******************************************************************************/\n'
+            removeUnusedImports()
+            eclipse().configFile new File(rootProject.projectDir.absolutePath, 'eclipse-formatter.xml')
+        }
+    }
 }
 
 ant.importBuild("fetch.xml") { antTargetName ->
-    "ant-task-" + antTargetName    
+    "ant-task-" + antTargetName
 }
 task fetchNatives(dependsOn: "ant-task-all"){
     doLast {

--- /dev/null
+++ b/extensions/gdx-setup/.gitignore
@@ -0,0 +1 @@
+!/res/com/badlogic/gdx/setup/resources/html/war

--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -38,6 +38,7 @@ versions.androidMinSdk = 14
 versions.androidBuildTools = "29.0.3"
 versions.androidFragment = "1.2.3"
 versions.javaparser = "2.3.0"
+versions.spotless = "5.14.3"
 
 libraries.lwjgl = [
         "org.lwjgl.lwjgl:lwjgl:${versions.lwjgl}",

--- a/tests/gdx-tests-gwt/war/index.html
+++ b/tests/gdx-tests-gwt/webapp/index.html
@@ -1,25 +1,25 @@
-<!doctype html>
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <title>libGDX GWT Test Runner</title>
-  </head>
-  <body>
-    <h1>libGDX GWT Test Runner</h1>
-    UI should load here shortly:<br>
-    <div id="embed-com.badlogic.gdx.tests.gwt.GdxTestsGwt"></div>
-    <small>This page is from <code>tests/gdx-tests-gwt/war/index.html</code>. Enter superdev here:
-    <a class="superdev" href="javascript:%7B%20window.__gwt_bookmarklet_params%20%3D%20%7B'server_url'%3A'http%3A%2F%2Flocalhost%3A9876%2F'%7D%3B%20var%20s%20%3D%20document.createElement('script')%3B%20s.src%20%3D%20'http%3A%2F%2Flocalhost%3A9876%2Fdev_mode_on.js'%3B%20void(document.getElementsByTagName('head')%5B0%5D.appendChild(s))%3B%7D">&#8635;</a>
-    </small>
-    <script type="text/javascript" language="javascript" src="com.badlogic.gdx.tests.gwt.GdxTestsGwt/com.badlogic.gdx.tests.gwt.GdxTestsGwt.nocache.js">
-window.onkeydown =
-  function(event) {
-    // prevent all navigation keys except the space key
-    if([9, 33, 34, 35, 36, 37, 38, 39, 40].indexOf(event.keyCode) > -1) {
-        event.preventDefault();
-        return false;
-    }
-  };
-    </script>
-  </body>
-</html>
+<!doctype html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title>libGDX GWT Test Runner</title>
+  </head>
+  <body>
+    <h1>libGDX GWT Test Runner</h1>
+    UI should load here shortly:<br>
+    <div id="embed-com.badlogic.gdx.tests.gwt.GdxTestsGwt"></div>
+    <small>This page is from <code>tests/gdx-tests-gwt/webapp/index.html</code>. Enter superdev here:
+    <a class="superdev" href="javascript:%7B%20window.__gwt_bookmarklet_params%20%3D%20%7B'server_url'%3A'http%3A%2F%2Flocalhost%3A9876%2F'%7D%3B%20var%20s%20%3D%20document.createElement('script')%3B%20s.src%20%3D%20'http%3A%2F%2Flocalhost%3A9876%2Fdev_mode_on.js'%3B%20void(document.getElementsByTagName('head')%5B0%5D.appendChild(s))%3B%7D">&#8635;</a>
+    </small>
+    <script type="text/javascript" language="javascript" src="com.badlogic.gdx.tests.gwt.GdxTestsGwt/com.badlogic.gdx.tests.gwt.GdxTestsGwt.nocache.js">
+window.onkeydown =
+  function(event) {
+    // prevent all navigation keys except the space key
+    if([9, 33, 34, 35, 36, 37, 38, 39, 40].indexOf(event.keyCode) > -1) {
+        event.preventDefault();
+        return false;
+    }
+  };
+    </script>
+  </body>
+</html>