chore(git): merge branch 'master' into fix/improve-lobby

Author: xeruf

.dev/githooks/prepare-commit-msg

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# This hook adds a comment for guidance about the commit message
+# format on top of the default commit message.
+#
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, set the hooksPath in git:
+# git config core.hooksPath .dev/githooks
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+beginswith() { case $2 in "$1"*) true;; *) false;; esac; }
+
+original=$(cat "$COMMIT_MSG_FILE")
+if beginswith $'\n#' "$original"; then
+    {
+        printf "\n\n# Please enter the message in the format\n"
+        echo "# <type>(<scope>): <description>"
+        echo "# Possible types: fix, feat, docs, style, refactor, test, chore, rework, release"
+        printf "# For details see https://www.notion.so/softwarechallenge/Git-217333329ea64db5b2cc8bbbaf79db87" >> "$COMMIT_MSG_FILE"
+        echo "$original"
+    } > "$COMMIT_MSG_FILE"
+fi

.settings/org.eclipse.buildship.core.prefs

@@ -1,4 +1,4 @@
-socha.gameName=hive
-socha.version.year=20
-socha.version.minor=03
-socha.version.patch=04
+socha.gameName=blokus
+socha.version.year=21
+socha.version.minor=00
+socha.version.patch=00

buildSrc/build.gradle.kts

@@ -2,14 +2,17 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.InputStream
 import java.util.concurrent.atomic.AtomicBoolean
+import sc.gradle.ScriptsTask
 
 plugins {
     maven
     `java-library`
     kotlin("jvm") version "1.3.71"
-    id("com.github.ben-manes.versions") version "0.28.0"
-    id("se.patrikerdes.use-latest-versions") version "0.2.13"
     id("org.jetbrains.dokka") version "0.9.17"
+    id("scripts-task")
+    
+    id("com.github.ben-manes.versions") version "0.31.0"
+    id("se.patrikerdes.use-latest-versions") version "0.2.14"
 }
 
 val gameName by extra { property("socha.gameName") as String }

gradle.properties

@@ -0,0 +1,23 @@
+plugins {
+    kotlin("jvm") version "1.3.71"
+    `java-gradle-plugin`
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    implementation(gradleApi())
+    implementation(kotlin("stdlib"))
+}
+
+sourceSets["main"].java.srcDir("src")
+
+gradlePlugin {
+    // we need a placeholder plugin to make the task available, see https://medium.com/p/64ff99344b58#8084
+    plugins.register("scripts-task") {
+        id = "scripts-task"
+        implementationClass = "sc.gradle.PlaceholderPlugin"
+    }
+}

gradle/build.gradle.kts

@@ -1,3 +1,5 @@
+package sc.gradle
+
 import org.gradle.api.*
 import org.gradle.api.tasks.*
 import java.io.File
@@ -19,4 +21,10 @@ open class ScriptsTask : DefaultTask() {
             setExecutable(true)
         }
     }
+}
+
+class PlaceholderPlugin: Plugin<Project> {
+    override fun apply(target: Project) {
+        // no-op
+    }
 }

gradle/custom-tasks/build.gradle.kts

@@ -1,6 +1,5 @@
-#Tue Sep 04 15:41:31 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

buildSrc/src/ScriptsTask.kt renamed to gradle/custom-tasks/src/sc/gradle/ScriptsTask.kt

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"