Skip to content

Commit

Permalink
Modular setup and formatting cleanup.
Browse files Browse the repository at this point in the history
Update jansi dependency to 1.11.
Update guava dependency to 14.0.1.
Update cling-support to 2.0-alpha2 under new groupId.
Update cereal and react versions to 1.0.0-SNAPSHOT.
Update bcprov-jdk15on dependency to 1.49.
Remove alta-processors dependency.
Math lib artifactId changed to spout-math.
  • Loading branch information
Wulfspider committed Jul 25, 2013
1 parent fd53249 commit 862cccf
Show file tree
Hide file tree
Showing 1,099 changed files with 12,277 additions and 17,037 deletions.
8 changes: 7 additions & 1 deletion api/.gitattributes → .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Normalize as LF in the repository, OS native locally
* text
* text=auto
*.java text

# Binary files that should not be modified
*.dat binary
*.db binary
*.icns binary
*.ico binary
*.key binary
*.jks binary
*.jpg binary
*.png binary
*.ttf binary
*.wav binary
JavaApplicationStub binary
61 changes: 33 additions & 28 deletions engine/.gitignore → .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Compiled source #
###################
# Build #
#########
MANIFEST.MF
dependency-reduced-pom.xml

# Compiled #
############
bin
build
dist
lib
out
target
Expand All @@ -11,9 +18,11 @@ target
*.o
*.so

# Git #
#######
.git
# Databases #
#############
*.db
*.sql
*.sqlite

# Packages #
############
Expand All @@ -26,33 +35,32 @@ target
*.tar
*.zip

# Logs and databases #
######################
# Repository #
##############
.git

# Logging #
###########
/logs
*.log
*.sql
*.sqlite

# OS generated files #
######################
# Misc #
########
*.bak

# System #
##########
.DS_Store
ehthumbs.db
Icon?
Thumbs.db

# Build files #
#################
MANIFEST.MF
dependency-reduced-pom.xml

# Project files #
#################
# Project #
###########
.classpath
.externalToolBuilders
.idea
.project
.settings
build
dist
nbproject
atlassian-ide-plugin.xml
build.xml
Expand All @@ -61,17 +69,14 @@ nb-configuration.xml
*.ipr
*.iws

# Misc files #
##############
*.bak

# Spout runtime folders #
#########################
# Runtime #
###########
/cache
/config
/data
/logs
/natives
/plugins
/resources
/update
/updates
/worlds
2 changes: 1 addition & 1 deletion api/.travis.yml → .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java
jdk: oraclejdk7

install: mvn clean -DbuildNumber=${TRAVIS_BUILD_NUMBER}
script: mvn clean -DbuildNumber=${TRAVIS_BUILD_NUMBER}
after_success:
- export PROJECT_ARTIFACT_ID="`sed -n 's|.*<artifactId>\(.*\)</artifactId>.*|\1|p' $TRAVIS_BUILD_DIR/pom.xml | awk '{ print $1; exit }'`" && echo Project artifactId is $PROJECT_ARTIFACT_ID
- export PROJECT_NAME="`sed -n 's|.*<name>\(.*\)</name>.*|\1|p' $TRAVIS_BUILD_DIR/pom.xml | awk '{ print $1; exit }'`" && echo Project name is $PROJECT_NAME
Expand Down
8 changes: 4 additions & 4 deletions logging/HEADER.txt → HEADER.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
This file is part of ${name}.
This file is part of Spout.

Copyright (c) ${inceptionYear} ${organization} <${url}/>
${name} is licensed under the Spout License Version 1.
Spout is licensed under the Spout License Version 1.

${name} is free software: you can redistribute it and/or modify it under
Spout is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
Expand All @@ -12,7 +12,7 @@ In addition, 180 days after any changes are published, you can use the
software, incorporating those changes, under the terms of the MIT license,
as described in the Spout License Version 1.

${name} is distributed in the hope that it will be useful, but WITHOUT ANY
Spout is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
more details.
Expand Down
File renamed without changes.
66 changes: 0 additions & 66 deletions api/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions api/HEADER.txt

This file was deleted.

63 changes: 0 additions & 63 deletions api/README.md

This file was deleted.

Loading

0 comments on commit 862cccf

Please sign in to comment.