Skip to content

Commit

Permalink
Merge branch 'master' into action
Browse files Browse the repository at this point in the history
  • Loading branch information
ZoteTheMighty committed Dec 2, 2020
2 parents b7d851a + 9e1736a commit 2785e53
Show file tree
Hide file tree
Showing 26 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .luacov
@@ -1,6 +1,6 @@
return {
include = {
"^lib",
"^src",
},
exclude = {
"%.spec$",
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -22,7 +22,7 @@ install:
- luarocks install luacheck

script:
- luacheck lib
- luacheck src
- lua -lluacov spec.lua

after_success:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -71,7 +71,7 @@ Add a line under the "Current master" heading. When we make a new release, all o
### Luacheck
We use [Luacheck](https://github.com/mpeterv/luacheck) for static analysis of Lua on all of our projects.

From the command line, just run `luacheck lib` to check the Rodux source.
From the command line, just run `luacheck src` to check the Rodux source.

You should get it working on your system, and then get a plugin for the editor you use. There are plugins available for most popular editors!

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -24,7 +24,7 @@
* Insert the model into Studio into a place like `ReplicatedStorage`

### Method 2: Filesystem
* Copy the `lib` directory into your codebase
* Copy the `src` directory into your codebase
* Rename the folder to `Rodux`
* Use a plugin like [Rojo](https://github.com/LPGhatguy/rojo) to sync the files into a place

Expand Down
2 changes: 1 addition & 1 deletion default.project.json
@@ -1,6 +1,6 @@
{
"name": "Rodux",
"tree": {
"$path": "lib"
"$path": "src"
}
}
2 changes: 1 addition & 1 deletion docs/introduction/installation.md
Expand Up @@ -7,6 +7,6 @@ For our examples, we'll install `Rodux` to `ReplicatedStorage`. In practice, it'
* Insert the model into Studio into a place like `ReplicatedStorage`

### Method 2: Filesystem
* Copy the `lib` directory into your codebase
* Copy the `src` directory into your codebase
* Rename the folder to `Rodux`
* Use a plugin like [Rojo](https://github.com/LPGhatguy/rojo) to sync the files into a place
2 changes: 1 addition & 1 deletion rotriever.toml
Expand Up @@ -2,5 +2,5 @@
name = "roblox/rodux"
author = "Roblox"
license = "Apache-2.0"
content_root = "lib"
content_root = "src"
version = "1.0.0"
2 changes: 1 addition & 1 deletion spec.lua
Expand Up @@ -4,7 +4,7 @@

-- If you add any dependencies, add them to this table so they'll be loaded!
local LOAD_MODULES = {
{"lib", "Library"},
{"src", "Library"},
{"modules/testez/lib", "TestEZ"},
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2785e53

Please sign in to comment.