From 8183e302d7bbbdd909a381c2402aaa731e4d8e7c Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Mon, 2 May 2016 16:42:50 -0400 Subject: [PATCH] Remove redundant .idea folder More clean up of unecessary files/folders. .idea folder at top level (current one is in android/Scratchjr .settings/.project/.esformatter leftover files from other IDEs and tools Added notes to the README to clarify what folder/file to open in XCode or Android Studio --- .esformatter | 26 --------------------- .idea/compiler.xml | 22 ------------------ .idea/copyright/profiles_settings.xml | 3 --- .idea/encodings.xml | 6 ----- .idea/libraries/Size_Pngs.xml | 9 -------- .idea/libraries/gradle_wrapper.xml | 9 -------- .idea/misc.xml | 32 -------------------------- .idea/modules.xml | 10 -------- .idea/vcs.xml | 6 ----- .project | 11 --------- .settings/launch.json | 33 --------------------------- README.md | 2 +- 12 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 .esformatter delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/Size_Pngs.xml delete mode 100644 .idea/libraries/gradle_wrapper.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .project delete mode 100644 .settings/launch.json diff --git a/.esformatter b/.esformatter deleted file mode 100644 index d7bfb2a..0000000 --- a/.esformatter +++ /dev/null @@ -1,26 +0,0 @@ -{ - "indent": { - "value": " " - }, - "whiteSpace": { - "before": { - "FunctionExpressionOpeningBrace": 1, - "FunctionExpressionClosingBrace": 0 - }, - "after": { - "FunctionExpressionOpeningBrace": 1, - "FunctionExpressionClosingBrace": -1, - "FunctionReservedWord": 1 - } - }, - "plugins": [ - "esformatter-quotes", - "esformatter-semicolons", - "esformatter-dot-notation", - "esformatter-braces" - ], - "quotes": { - "type": "single", - "avoidEscape": false - } -} diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Size_Pngs.xml b/.idea/libraries/Size_Pngs.xml deleted file mode 100644 index 627c840..0000000 --- a/.idea/libraries/Size_Pngs.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/gradle_wrapper.xml b/.idea/libraries/gradle_wrapper.xml deleted file mode 100644 index 0593464..0000000 --- a/.idea/libraries/gradle_wrapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f50b2b9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 29315b5..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 30a5db9..0000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - scratchjr_git - - - - - - - - diff --git a/.settings/launch.json b/.settings/launch.json deleted file mode 100644 index 2a6441e..0000000 --- a/.settings/launch.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "0.1.0", - // List of configurations. Add new configurations or edit existing ones. - // ONLY "node" and "mono" are supported, change "type" to switch. - "configurations": [ - { - // Name of configuration; appears in the launch configuration drop down menu. - "name": "Launch app.js", - // Type of configuration. Possible values: "node", "mono". - "type": "node", - // Workspace relative or absolute path to the program. - "program": "app.js", - // Automatically stop program after launch. - "stopOnEntry": true, - // Command line arguments passed to the program. - "args": [], - // Workspace relative or absolute path to the working directory of the program being debugged. Default is the current workspace. - "cwd": ".", - // Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH. - "runtimeExecutable": null, - // Environment variables passed to the program. - "env": { } - }, - { - "name": "Attach", - "type": "node", - // TCP/IP address. Default is "localhost". - "address": "localhost", - // Port to attach to. - "port": 5858 - } - ] -} diff --git a/README.md b/README.md index b7c2f91..e610338 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ On OS X: * Run brew install librsvg to install rsvg-convert * Run brew install imagemagick to install ImageMagick -Once these are installed, select the appropriate target in XCode or the appropriate flavor/build variant in Android Studio. +Once these are installed, select the appropriate target in XCode or the appropriate flavor/build variant in Android Studio. To build in Android Studio, open the project android/ScratchJr. To build for iOS in XCode, open ios/ScratchJr.xcworkspace as ScratchJr uses CocoaPods. ## Where and how to make changes