Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
root = true

[*]
end_of_line = lf
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# General line-ending rules
*.as text eol=lf
*.bash text eol=lf
*.conf text eol=lf
*.ftl text eol=lf
*.h text eol=lf
*.java text eol=lf
*.jnlp text eol=lf
*.js text eol=lf
*.less text eol=lf
*.properties text eol=lf
*.py text eol=lf
*.sh text eol=lf
*.sql text eol=lf
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
java-version: [8, 11, 17]
java-version: [17, 21, 25]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
46 changes: 23 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
.classpath
.project
.settings/
*.iml
.idea/
/code/target
/code/*.iml
/code/*.ipr
/code/*.iws
/code/.idea
/dreamcatcher/target
/dreamcatcher/*.iml
/dreamcatcher/*.ipr
/dreamcatcher/*.iws
/dreamcatcher/.idea
/code/clean.bat
.idea
target
/samples/helloworld/helloworld.iml
/samples/helloworld/helloworld.log
/samples/bloggy/*.iml
/samples/bloggy/*.log
.classpath
.project
.settings/
*.iml
.idea/

/code/target
/code/*.iml
/code/*.ipr
/code/*.iws
/code/.idea
/dreamcatcher/target
/dreamcatcher/*.iml
/dreamcatcher/*.ipr
/dreamcatcher/*.iws
/dreamcatcher/.idea
/code/clean.bat
.idea
target
/samples/helloworld/helloworld.iml
/samples/helloworld/helloworld.log
/samples/bloggy/*.iml
/samples/bloggy/*.log
18 changes: 9 additions & 9 deletions code/bundle.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
setlocal enabledelayedexpansion
if not "!JAVA8_64_HOME!"=="" (
set PATH=!JAVA8_64_HOME!\bin;!PATH!
set JAVA_HOME=!JAVA8_64_HOME!
)
call mvn.cmd validate --batch-mode
call mvn.cmd -Dfile.encoding=UTF-8 -DcreateChecksum=true clean source:jar javadoc:jar repository:bundle-create install --batch-mode
setlocal enabledelayedexpansion

if not "!JAVA17_64_HOME!"=="" (
set PATH=!JAVA17_64_HOME!\bin;!PATH!
set JAVA_HOME=!JAVA17_64_HOME!
)

call mvn.cmd validate --batch-mode
call mvn.cmd -Dfile.encoding=UTF-8 -DcreateChecksum=true clean source:jar javadoc:jar repository:bundle-create install --batch-mode
2 changes: 1 addition & 1 deletion code/lib/install.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn install:install-file -Dfile="guice-5.0.2-SNAPSHOT.jar" -DgroupId=com.google.inject -DartifactId=guice -Dversion=5.0.2-SNAPSHOT -Dpackaging=jar
mvn install:install-file -Dfile="guice-5.0.2-SNAPSHOT.jar" -DgroupId=com.google.inject -DartifactId=guice -Dversion=5.0.2-SNAPSHOT -Dpackaging=jar
Loading