Add git attributes to control cr/lf of files

markjfisher · Dec 4, 2022 · 5fa57ed · 5fa57ed
1 parent 9fa8f3a
commit 5fa57ed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,11 @@
+# force LF everywhere
+* text=lf
+
+# except .bat files
+*.bat text eol=crlf
+
+# add binary file types
+*.jar binary
+*.png binary
+*.obj binary
+*.ttf binary
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ logbackEncoderVersion=6.4
 kotlinLoggingVersion=2.0.3
 
 junitJupiterEngineVersion=5.7.0
-assertJVersion=3.18.1
+assertJVersion=3.23.1
 mockkVersion=1.10.2
 
 org.gradle.parallel=true

diff --git a/visualisations/build.gradle.kts b/visualisations/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
     kotlin("jvm")
@@ -29,7 +30,7 @@ val lwjglVersion: String by project
 val glnVersion: String by project
 val jomlVersion: String by project
 
-val lwjglNatives = "natives-linux"
+val lwjglNatives = "natives-" + if (Os.isFamily(Os.FAMILY_WINDOWS)) "windows" else "linux"
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))

diff --git a/visualisations/src/main/kotlin/engine/GameWorld.kt b/visualisations/src/main/kotlin/engine/GameWorld.kt
@@ -125,7 +125,7 @@ abstract class GameWorld<T : GridItemData>(
 
     // Main Options for application, games should set any additional data needed on the gameOptions extensions
     val globalOptions = GlobalOptions(
-        optionsName = "Octopus Options",
+        optionsName = "Options",
         gameOptions = GameOptions(
             pauseGame = true,
             gameSpeed = 5,