diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/html/full-size.html | 4 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 3 | ||||
| -rw-r--r-- | misc/ide/jetbrains/build.gradle | 2 | ||||
| -rw-r--r-- | misc/ide/jetbrains/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rwxr-xr-x | misc/travis/clang-format.sh | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/misc/dist/html/full-size.html b/misc/dist/html/full-size.html index 0e8a41a9fc..349420b3f3 100644 --- a/misc/dist/html/full-size.html +++ b/misc/dist/html/full-size.html @@ -180,8 +180,8 @@ $GODOT_HEAD_INCLUDE [statusProgress, statusIndeterminate, statusNotice].forEach(elem => { elem.style.display = 'none'; }); - if (animateStatusIndeterminate in animationCallbacks) { - animationCallbacks.erase(animateStatusIndeterminate); + animationCallbacks = animationCallbacks.filter(function(value) { + return (value != animateStatusIndeterminate); } switch (mode) { case 'progress': diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index db241ad172..3a0ac9f389 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -86,6 +86,9 @@ do if grep -q "thirdparty" <<< $file; then continue; fi + if grep -q "platform/android/java/src/com" <<< $file; then + continue; + fi # ignore file if we do check for file extensions and the file # does not match any of the extensions specified in $FILE_EXTS diff --git a/misc/ide/jetbrains/build.gradle b/misc/ide/jetbrains/build.gradle index eb2fbc0e69..dea81b4ea3 100644 --- a/misc/ide/jetbrains/build.gradle +++ b/misc/ide/jetbrains/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/misc/ide/jetbrains/gradle/wrapper/gradle-wrapper.properties b/misc/ide/jetbrains/gradle/wrapper/gradle-wrapper.properties index b477add150..22e7a5c60b 100644 --- a/misc/ide/jetbrains/gradle/wrapper/gradle-wrapper.properties +++ b/misc/ide/jetbrains/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 31 16:34:43 PDT 2019 +#Wed Aug 21 13:47:30 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 5463a6cedf..48378281d4 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -11,7 +11,7 @@ else RANGE=HEAD fi -FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") +FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -v platform/android/java/src/com/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") echo "Checking files:\n$FILES" # create a random filename to store our generated patch |