Skip to content

Commit 0bbe958

Browse files
authored
Merge pull request #224 from jonherrmann/main
RC 2.1.0-rc.1
2 parents 95c8ae6 + 5993f02 commit 0bbe958

File tree

1,512 files changed

+234151
-5767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,512 files changed

+234151
-5767
lines changed

.appveyor.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.editorconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,18 @@ indent_style = space
88
indent_size = 4
99
trim_trailing_whitespace = true
1010
insert_final_newline = true
11-
max_line_length = 128
11+
max_line_length = 120
1212

1313
[*.{md,txt}]
1414
indent_style = space
1515
indent_size = 4
1616
trim_trailing_whitespace = false
17+
max_line_length = 120
18+
19+
[*.scala]
20+
charset = utf-8
21+
indent_style = space
22+
indent_size = 4
23+
trim_trailing_whitespace = true
24+
insert_final_newline = true
25+
max_line_length = 120

.gitattributes

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
11
* text eol=lf
2+
3+
*.jar binary
4+
*.png binary
5+
*.jpg binary
6+
*.jpeg binary
7+
*.gif binary
8+
*.ico binary
9+
*.mov binary
10+
*.mp4 binary
11+
*.mp3 binary
12+
*.flv binary
13+
*.fla binary
14+
*.swf binary
15+
*.gz binary
16+
*.zip binary
17+
*.7z binary
18+
*.ttf binary

.github/workflows/gradle.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Java CI
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up JDK 11
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: '11'
15+
distribution: 'temurin'
16+
- name: Setup Gradle
17+
uses: gradle/gradle-build-action@v2
18+
- name: Execute Gradle build
19+
run: ./gradlew war
20+
- name: Release
21+
uses: softprops/action-gh-release@v1
22+
if: startsWith(github.ref, 'refs/tags/')
23+
with:
24+
draft: true
25+
files: etf-webapp/build/libs/etf-webapp.war

.gitignore

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,58 @@
1+
*.class
12
.DS_Store
23
.gradle
3-
.idea
4-
etf-webapp.iml
5-
etf.log
6-
etf.*.log
7-
src/main/webapp/WEB-INF/etf/reportstyles/**
8-
src/main/webapp/ii/jquery*
9-
src/main/webapp/ii/webjars*
10-
src/main/webapp/ii/*runtfile*
11-
src/main/webapp/ii/images
12-
build
13-
src/main/webapp/help
14-
etf-*.log
15-
etf-*.zip
16-
hs_err_pid*.log
4+
hs_err_pid*
5+
*.log
6+
build/
7+
out/
8+
outputFileStates.bin
9+
*.licensed
1710
/build-dependencies.txt
11+
local.properties
12+
.env
13+
.venv
14+
coverage.xml
15+
!gradle/wrapper/gradle-wrapper.jar
16+
17+
### IntelliJ IDEA ###
18+
.idea
19+
*.iws
20+
*.iml
21+
*.ipr
22+
23+
### VS Code ###
24+
.vscode/
25+
26+
### Eclipse ###
27+
.target
28+
.texlipse
29+
.cache-main
30+
.scala_dependencies
31+
.worksheet
32+
*.launch
33+
.project
34+
.settings
35+
36+
### STS ###
37+
.apt_generated
38+
.classpath
39+
.factorypath
40+
.springBeans
41+
.sts4-cache
42+
43+
### NetBeans ###
44+
/nbproject/private/
45+
/nbbuild/
46+
/dist/
47+
/nbdist/
48+
/.nb-gradle/
49+
50+
### Scala ###
51+
target/
52+
boot/
53+
lib_managed/
54+
src_managed/
55+
project/boot/
56+
project/plugins/project/
57+
.metals
58+
.scala_dependencies

.travis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)