[ts][pixi] Move pixi to pixi-v7

.gitignore

@@ -145,7 +145,7 @@ spine-ts/spine-canvas/dist
 spine-ts/spine-webgl/dist
 spine-ts/spine-player/dist
 spine-ts/spine-threejs/dist
-spine-ts/spine-pixi/dist
+spine-ts/spine-pixi-v7/dist
 spine-ts/spine-pixi-v8/dist
 spine-libgdx/gradle
 spine-libgdx/gradlew

spine-ts/README.md

@@ -10,7 +10,7 @@ up into multiple modules:
 1. `spine-threejs/`, a self-contained [THREE.JS](https://threejs.org/) backend, built on the core classes.
 1. `spine-player/`, a self-contained player to easily display Spine animations on your website, built on the core classes and WebGL backend.
 1. `spine-phaser/`, a [Phaser](https://phaser.io/) backend, built on the core classes.
-1. `spine-pixi/`, a [PixiJS v7](https://pixijs.com/) backend, built on the core classes.
+1. `spine-pixi-v7/`, a [PixiJS v7](https://pixijs.com/) backend, built on the core classes.
 1. `spine-pixi-v8/`, a [PixiJS v8](https://pixijs.com/) backend, built on the core classes.
 
 In most cases, the `spine-player` module is best suited for your needs. Please refer to the [Spine Web Player documentation](https://esotericsoftware.com/spine-player) for more information.
@@ -19,7 +19,7 @@ For documentation of the core API in `spine-core`, please refer to our [Spine Ru
 
 For documentation of `spine-phaser`, please refer to our [spine-phaser Guide](https://esotericsoftware.com/spine-phaser).
 
-For documentation of `spine-pixi` and `spine-pixi-v8`, please refer to our [spine-pixi Guide](https://esotericsoftware.com/spine-pixi).
+For documentation of `spine-pixi-v7` and `spine-pixi-v8`, please refer to our [spine-pixi Guide](https://esotericsoftware.com/spine-pixi).
 
 For documentation of `spine-canvaskit`, please refer to our [spine-canvaskit Guide](https://esotericsoftware.com/spine-canvaskit).
 
@@ -79,7 +79,7 @@ You can include a module in your project via a `<script>` tag from the [unpkg](h
 <script src="https://unpkg.com/@esotericsoftware/spine-phaser@4.2.*/dist/iife/spine-phaser.js"></script>
 
 // spine-pixi
-<script src="https://unpkg.com/@esotericsoftware/spine-pixi@4.2.*/dist/iife/spine-pixi.js"></script>
+<script src="https://unpkg.com/@esotericsoftware/spine-pixi-v7@4.2.*/dist/iife/spine-pixi-v7.js"></script>
 
 // spine-pixi-v8
 <script src="https://unpkg.com/@esotericsoftware/spine-pixi-v8@4.2.*/dist/iife/spine-pixi-v8.js"></script>
@@ -101,7 +101,7 @@ npm install @esotericsoftware/spine-webgl
 npm install @esotericsoftware/spine-player
 npm install @esotericsoftware/spine-threejs
 npm install @esotericsoftware/spine-phaser
-npm install @esotericsoftware/spine-pixi
+npm install @esotericsoftware/spine-pixi-v7
 npm install @esotericsoftware/spine-pixi-v8
 ```
 

spine-ts/build.sh

@@ -20,7 +20,7 @@ then
 		spine-webgl/dist/iife/* \
 		spine-player/dist/iife/* \
 		spine-threejs/dist/iife/* \
-		spine-pixi/dist/iife/* \
+		spine-pixi-v7/dist/iife/* \
 		spine-pixi-v8/dist/iife/* \
 		spine-phaser/dist/iife/* \
 		spine-player/css/spine-player.css

spine-ts/index.html

@@ -29,32 +29,32 @@
         <li><a href="/spine-canvaskit/example/physics.html">Physics</a></li>
         <li><a href="/spine-canvaskit/example/micro-benchmark.html">Micro Benchmark</a></li>
       </ul>
-      <li>Pixi</li>
+      <li>PixiJS v7</li>
       <ul>
-        <li><a href="/spine-pixi/example/index.html">Basic example</a></li>
-        <li><a href="/spine-pixi/example/manual-loading.html">Manual Loading</a></li>
+        <li><a href="/spine-pixi-v7/example/index.html">Basic example</a></li>
+        <li><a href="/spine-pixi-v7/example/manual-loading.html">Manual Loading</a></li>
         <li>
-          <a href="/spine-pixi/example/events-example.html">Events example</a>
+          <a href="/spine-pixi-v7/example/events-example.html">Events example</a>
         </li>
         <li>
-          <a href="/spine-pixi/example/mix-and-match-example.html">Mix and match example</a>
+          <a href="/spine-pixi-v7/example/mix-and-match-example.html">Mix and match example</a>
         </li>
         <li>
-          <a href="/spine-pixi/example/simple-input.html">Simple input</a>
+          <a href="/spine-pixi-v7/example/simple-input.html">Simple input</a>
         </li>
         <li>
-          <a href="/spine-pixi/example/mouse-following.html">Mouse following</a>
+          <a href="/spine-pixi-v7/example/mouse-following.html">Mouse following</a>
         </li>
         <li>
-          <a href="/spine-pixi/example/control-bones-example.html">Control bones example</a>
+          <a href="/spine-pixi-v7/example/control-bones-example.html">Control bones example</a>
         </li>
-        <li><a href="/spine-pixi/example/physics.html">Physics</a></li>
-        <li><a href="/spine-pixi/example/physics2.html">Physics II</a></li>
-        <li><a href="/spine-pixi/example/physics3.html">Physics III</a></li>
-        <li><a href="/spine-pixi/example/physics4.html">Physics IV</a></li>
-        <li><a href="/spine-pixi/example/slot-objects.html">Slot Objects</a></li>
+        <li><a href="/spine-pixi-v7/example/physics.html">Physics</a></li>
+        <li><a href="/spine-pixi-v7/example/physics2.html">Physics II</a></li>
+        <li><a href="/spine-pixi-v7/example/physics3.html">Physics III</a></li>
+        <li><a href="/spine-pixi-v7/example/physics4.html">Physics IV</a></li>
+        <li><a href="/spine-pixi-v7/example/slot-objects.html">Slot Objects</a></li>
       </ul>
-      <li>Pixi V8</li>
+      <li>PixiJS v8</li>
       <ul>
         <li><a href="/spine-pixi-v8/example/index.html">Basic example</a></li>
         <li><a href="/spine-pixi-v8/example/manual-loading.html">Manual Loading</a></li>

spine-ts/package-lock.json

@@ -14,7 +14,7 @@
         "spine-phaser",
         "spine-player",
         "spine-threejs",
-        "spine-pixi",
+        "spine-pixi-v7",
         "spine-pixi-v8",
         "spine-canvaskit",
         "spine-webgl"
@@ -74,8 +74,8 @@
       "resolved": "spine-phaser",
       "link": true
     },
-    "node_modules/@esotericsoftware/spine-pixi": {
-      "resolved": "spine-pixi",
+    "node_modules/@esotericsoftware/spine-pixi-v7": {
+      "resolved": "spine-pixi-v7",
       "link": true
     },
     "node_modules/@esotericsoftware/spine-pixi-v8": {
@@ -3167,6 +3167,23 @@
     "spine-pixi": {
       "name": "@esotericsoftware/spine-pixi",
       "version": "4.2.62",
+      "extraneous": true,
+      "license": "LicenseRef-LICENSE",
+      "dependencies": {
+        "@esotericsoftware/spine-core": "4.2.62"
+      },
+      "peerDependencies": {
+        "@pixi/assets": "^7.2.4",
+        "@pixi/core": "^7.2.4",
+        "@pixi/display": "^7.2.4",
+        "@pixi/graphics": "^7.2.4",
+        "@pixi/mesh": "^7.2.4",
+        "@pixi/text": "^7.2.4"
+      }
+    },
+    "spine-pixi-v7": {
+      "name": "@esotericsoftware/spine-pixi-v7",
+      "version": "4.2.62",
       "license": "LicenseRef-LICENSE",
       "dependencies": {
         "@esotericsoftware/spine-core": "4.2.62"

spine-ts/package.json

@@ -8,8 +8,8 @@
   ],
   "scripts": {
     "prepublish": "npm run clean && npm run build",
-    "clean": "npx rimraf spine-core/dist spine-canvas/dist spine-canvaskit/dist spine-webgl/dist spine-phaser/dist spine-player/dist spine-threejs/dist spine-pixi/dist spine-pixi-v8/dist",
-    "build": "npm run clean && npm run build:modules && concurrently \"npm run build:core\" \"npm run build:canvas\" \"npm run build:canvaskit\" \"npm run build:webgl\" \"npm run build:phaser\" \"npm run build:player\" \"npm run build:threejs\" \"npm run build:pixi\" \"npm run build:pixi-v8\"",
+    "clean": "npx rimraf spine-core/dist spine-canvas/dist spine-canvaskit/dist spine-webgl/dist spine-phaser/dist spine-player/dist spine-threejs/dist spine-pixi-v7/dist spine-pixi-v8/dist",
+    "build": "npm run clean && npm run build:modules && concurrently \"npm run build:core\" \"npm run build:canvas\" \"npm run build:canvaskit\" \"npm run build:webgl\" \"npm run build:phaser\" \"npm run build:player\" \"npm run build:threejs\" \"npm run build:pixi-v7\" \"npm run build:pixi-v8\"",
     "postbuild": "npm run minify",
     "build:modules": "npx tsc -b -clean && npx tsc -b",
     "build:core": "npx esbuild --bundle spine-core/src/index.ts --tsconfig=spine-core/tsconfig.json  --sourcemap --outfile=spine-core/dist/iife/spine-core.js --format=iife --global-name=spine",
@@ -19,10 +19,10 @@
     "build:player": "npx copyfiles -f spine-player/css/spine-player.css spine-player/dist/ && npx esbuild spine-player/dist/spine-player.css --minify --outfile=spine-player/dist/spine-player.min.css && npx esbuild --bundle spine-player/src/index.ts --tsconfig=spine-player/tsconfig.json  --sourcemap --outfile=spine-player/dist/iife/spine-player.js --format=iife --global-name=spine",
     "build:phaser": "npx esbuild  --bundle spine-phaser/src/index.ts  --tsconfig=spine-phaser/tsconfig.json   --sourcemap --outfile=spine-phaser/dist/iife/spine-phaser.js   --external:Phaser --alias:phaser=Phaser --format=iife --global-name=spine",
     "build:threejs": "npx esbuild --bundle spine-threejs/src/index.ts --tsconfig=spine-threejs/tsconfig.json  --sourcemap --outfile=spine-threejs/dist/iife/spine-threejs.js --external:three --format=iife --global-name=spine",
-    "build:pixi": "npx esbuild --bundle spine-pixi/src/index.ts --tsconfig=spine-pixi/tsconfig.json  --sourcemap --outfile=spine-pixi/dist/iife/spine-pixi.js --external:@pixi/* --format=iife --global-name=spine",
+    "build:pixi-v7": "npx esbuild --bundle spine-pixi-v7/src/index.ts --tsconfig=spine-pixi-v7/tsconfig.json  --sourcemap --outfile=spine-pixi-v7/dist/iife/spine-pixi-v7.js --external:@pixi/* --format=iife --global-name=spine",
     "build:pixi-v8": "npx esbuild --bundle spine-pixi-v8/src/index.ts --tsconfig=spine-pixi-v8/tsconfig.json  --sourcemap --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.js --external:pixi.js --format=iife --global-name=spine",
-    "minify": "npx esbuild --minify spine-core/dist/iife/spine-core.js --outfile=spine-core/dist/iife/spine-core.min.js && npx esbuild --minify spine-canvas/dist/iife/spine-canvas.js --outfile=spine-canvas/dist/iife/spine-canvas.min.js && npx esbuild --minify spine-canvaskit/dist/iife/spine-canvaskit.js --outfile=spine-canvaskit/dist/iife/spine-canvaskit.min.js && npx esbuild --minify spine-player/dist/iife/spine-player.js --outfile=spine-player/dist/iife/spine-player.min.js && npx esbuild --minify spine-phaser/dist/iife/spine-phaser.js --outfile=spine-phaser/dist/iife/spine-phaser.min.js && npx esbuild --minify spine-webgl/dist/iife/spine-webgl.js --outfile=spine-webgl/dist/iife/spine-webgl.min.js && npx esbuild --minify spine-threejs/dist/iife/spine-threejs.js --outfile=spine-threejs/dist/iife/spine-threejs.min.js && npx esbuild --minify spine-pixi/dist/iife/spine-pixi.js --outfile=spine-pixi/dist/iife/spine-pixi.min.js && npx esbuild --minify spine-pixi-v8/dist/iife/spine-pixi-v8.js --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.min.js",
-    "dev": "concurrently \"npx live-server\" \"npm run dev:canvas\" \"npm run dev:canvaskit\" \"npm run dev:webgl\" \"npm run dev:phaser\" \"npm run dev:player\" \"npm run dev:threejs\" \"npm run dev:pixi\" \"npm run dev:pixi-v8\" \"npm run dev:modules\"",
+    "minify": "npx esbuild --minify spine-core/dist/iife/spine-core.js --outfile=spine-core/dist/iife/spine-core.min.js && npx esbuild --minify spine-canvas/dist/iife/spine-canvas.js --outfile=spine-canvas/dist/iife/spine-canvas.min.js && npx esbuild --minify spine-canvaskit/dist/iife/spine-canvaskit.js --outfile=spine-canvaskit/dist/iife/spine-canvaskit.min.js && npx esbuild --minify spine-player/dist/iife/spine-player.js --outfile=spine-player/dist/iife/spine-player.min.js && npx esbuild --minify spine-phaser/dist/iife/spine-phaser.js --outfile=spine-phaser/dist/iife/spine-phaser.min.js && npx esbuild --minify spine-webgl/dist/iife/spine-webgl.js --outfile=spine-webgl/dist/iife/spine-webgl.min.js && npx esbuild --minify spine-threejs/dist/iife/spine-threejs.js --outfile=spine-threejs/dist/iife/spine-threejs.min.js && npx esbuild --minify spine-pixi-v7/dist/iife/spine-pixi-v7.js --outfile=spine-pixi-v7/dist/iife/spine-pixi-v7.min.js && npx esbuild --minify spine-pixi-v8/dist/iife/spine-pixi-v8.js --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.min.js",
+    "dev": "concurrently \"npx live-server\" \"npm run dev:canvas\" \"npm run dev:canvaskit\" \"npm run dev:webgl\" \"npm run dev:phaser\" \"npm run dev:player\" \"npm run dev:threejs\" \"npm run dev:pixi-v7\" \"npm run dev:pixi-v8\" \"npm run dev:modules\"",
     "dev:modules": "npm run build:modules -- --watch",
     "dev:canvas": "npm run build:canvas -- --watch",
     "dev:canvaskit": "npm run build:canvaskit -- --watch",
@@ -30,7 +30,7 @@
     "dev:phaser": "npm run build:phaser -- --watch",
     "dev:player": "npm run build:player -- --watch",
     "dev:threejs": "npm run build:threejs -- --watch",
-    "dev:pixi": "npm run build:pixi -- --watch",
+    "dev:pixi-v7": "npm run build:pixi-v7 -- --watch",
     "dev:pixi-v8": "npm run build:pixi-v8 -- --watch"
   },
   "repository": {
@@ -58,7 +58,7 @@
     "spine-phaser",
     "spine-player",
     "spine-threejs",
-    "spine-pixi",
+    "spine-pixi-v7",
     "spine-pixi-v8",
     "spine-canvaskit",
     "spine-webgl"

spine-ts/publish.sh

@@ -16,7 +16,7 @@ sed -i '' "s/$currentVersion/$newVersion/" spine-canvas/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-canvaskit/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-core/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-phaser/package.json
-sed -i '' "s/$currentVersion/$newVersion/" spine-pixi/package.json
+sed -i '' "s/$currentVersion/$newVersion/" spine-pixi-v7/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-pixi-v8/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-player/package.json
 sed -i '' "s/$currentVersion/$newVersion/" spine-threejs/package.json

spine-ts/spine-pixi-v7/example/control-bones-example.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/events-example.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/index.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/manual-loading.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/mix-and-match-example.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/mouse-following.html

@@ -3,7 +3,7 @@
         <meta charset="UTF-8" />
         <title>Spine Pixi Example</title>
         <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-        <script src="../dist/iife/spine-pixi.js"></script>
+        <script src="../dist/iife/spine-pixi-v7.js"></script>
         <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
         <link rel="stylesheet" href="../../index.css">
     </head>

spine-ts/spine-pixi-v7/example/physics.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/physics2.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/physics3.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/physics4.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/simple-input.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
     <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/example/slot-objects.html

@@ -2,8 +2,8 @@
   <head>
     <meta charset="UTF-8" />
     <title>spine-pixi</title>
-    <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.4.2/dist/pixi.min.js"></script>
-    <script src="../dist/iife/spine-pixi.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/pixi.js@7.2.0/dist/pixi.min.js"></script>
+    <script src="../dist/iife/spine-pixi-v7.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/tweakpane@3.1.9/dist/tweakpane.min.js"></script>
     <link rel="stylesheet" href="../../index.css">
   </head>

spine-ts/spine-pixi-v7/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@esotericsoftware/spine-pixi",
+  "name": "@esotericsoftware/spine-pixi-v7",
   "version": "4.2.62",
   "description": "The official Spine Runtimes for the web PixiJS v7.",
   "main": "dist/index.js",

spine-ts/tsconfig.json

@@ -23,7 +23,7 @@
       "path": "./spine-threejs"
     },
     {
-      "path": "./spine-pixi"
+      "path": "./spine-pixi-v7"
     },
     {
       "path": "./spine-pixi-v8"

spine-ts/tsfmt.json

@@ -3,7 +3,7 @@
 	"indentSize": 4,
 	"tabSize": 4,
 	"indentStyle": 2,
-	"newLineCharacter": "\r\n",
+	"newLineCharacter": "\n",
 	"convertTabsToSpaces": false,
 	"insertSpaceAfterCommaDelimiter": true,
 	"insertSpaceAfterSemicolonInForStatements": true,