Skip to content

Commit 2f8544b

Browse files
authored
Merge pull request #56 from BSStudio/feature/gradle-multi-module-rewrite
Gradle multi module config rewrite
2 parents 4db2a2a + 2416bea commit 2f8544b

35 files changed

Lines changed: 785 additions & 377 deletions

.circleci/config.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,38 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/openjdk:11-jdk-buster
6-
working_directory: ~/repo
7-
environment:
8-
JVM_OPTS: -Xmx3200m
9-
TERM: dumb
5+
- image: cimg/openjdk:11.0
106
steps:
117
- checkout
128
- restore_cache:
13-
keys:
14-
- v1-dependencies-{{ checksum "build.gradle" }}
15-
- v1-dependencies-
16-
- run: gradle dependencies
9+
key: v1-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
10+
- run: ./gradlew
1711
- save_cache:
1812
paths:
19-
- ~/.gradle
20-
key: v1-dependencies-{{ checksum "build.gradle" }}
21-
- run: gradle clean build --parallel
13+
- ~/.gradle/wrapper
14+
key: v1-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
15+
- run: ./gradlew check --parallel
16+
- store_test_results:
17+
path: web/build/test-results
18+
- store_test_results:
19+
path: service/build/test-results
20+
- store_artifacts:
21+
path: app/build/reports
22+
- store_artifacts:
23+
path: web/build/reports
24+
- store_artifacts:
25+
path: service/build/reports
26+
- store_artifacts:
27+
path: data/build/reports
28+
- store_artifacts:
29+
path: messaging/build/reports
2230
integration-test:
2331
docker:
24-
- image: circleci/openjdk:11-jdk-buster
32+
- image: cimg/base:2021.04
2533
steps:
2634
- checkout
2735
- setup_remote_docker:
28-
version: 19.03.13
36+
version: 20.10.2
2937
- run: docker-compose -f ./docker-compose.test.yaml up --build --abort-on-container-exit
3038
workflows:
3139
version: 2

.dockerignore

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
# Created by .ignore support plugin (hsz.mobi)
2-
### Gradle template
3-
.gradle
4-
/build/
1+
### Java template
2+
# Compiled class file
3+
*.class
54

6-
# Ignore Gradle GUI config
7-
gradle-app.setting
5+
# Log file
6+
*.log
87

9-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
10-
!gradle-wrapper.jar
8+
# BlueJ files
9+
*.ctxt
1110

12-
# Cache of project
13-
.gradletasknamecache
11+
# Mobile Tools for Java (J2ME)
12+
.mtj.tmp/
1413

15-
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
16-
# gradle/wrapper/gradle-wrapper.properties
14+
# Package Files #
15+
*.jar
16+
*.war
17+
*.nar
18+
*.ear
19+
*.zip
20+
*.tar.gz
21+
*.rar
22+
23+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
24+
hs_err_pid*
1725

1826
### JetBrains template
19-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
27+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
2028
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
2129

2230
# User-specific stuff
@@ -48,6 +56,7 @@ gradle-app.setting
4856
# auto-import.
4957
# .idea/artifacts
5058
# .idea/compiler.xml
59+
# .idea/jarRepositories.xml
5160
# .idea/modules.xml
5261
# .idea/*.iml
5362
# .idea/modules
@@ -87,7 +96,7 @@ fabric.properties
8796
# Android studio 3.1+ serialized cache file
8897
.idea/caches/build_file_checksums.ser
8998

90-
### Java template
99+
### Kotlin template
91100
# Compiled class file
92101
*.class
93102

@@ -112,16 +121,5 @@ fabric.properties
112121
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
113122
hs_err_pid*
114123

115-
# Ignore application properties.
116-
# Except CI and default configurations.
117-
**/application*.yml
118-
**/application*.yaml
119-
**/application*.properties
120-
121-
!**/application.yml
122-
!**/application.yaml
123-
!**/application.properties
124-
125-
!**/application-ci.yml
126-
!**/application-ci.yaml
127-
!**/application-ci.properties
124+
# Skip integration test folder
125+
integration

0 commit comments

Comments
 (0)