Skip to content

Commit ec8add0

Browse files
HayenaHayena
authored
Merge pull request #26 from code-star/multi-project-build
created multi project build
2 parents c7cfd69 + ac73d72 commit ec8add0

File tree

11 files changed

+329
-44
lines changed

11 files changed

+329
-44
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v1
1111
- name: Run Gradle
12-
run: cd backend && ./gradlew clean test
12+
run: ./gradlew :backend:clean backend:test
1313

1414
frontend:
1515
name: "frontend / Build and test"
@@ -29,5 +29,5 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v1
3131
- name: Run Gradle
32-
run: cd data && ./gradlew clean test
32+
run: ./gradlew data:clean data:test
3333

‎.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
*.tar.gz
2121
*.rar
2222

23+
# Kotlin
24+
/.gradle
25+
/out
26+
/build
27+
*.iml
28+
*.ipr
29+
*.iws
30+
2331
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2432
hs_err_pid*
2533

@@ -35,4 +43,6 @@ hs_err_pid*
3543
# build folders
3644
target
3745
# Mac
38-
.DS_Store
46+
.DS_Store
47+
48+

‎backend/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/.gradle
22
/.idea
3+
/.kotlintest
34
/out
45
/build
56
*.iml
67
*.ipr
78
*.iws
9+

‎backend/build.gradle.kts

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ apply(plugin = "com.github.johnrengelman.shadow")
1616

1717
plugins {
1818
application
19-
kotlin("jvm") version "1.3.50"
20-
kotlin("kapt") version "1.3.50"
19+
kotlin("jvm")
20+
kotlin("kapt")
2121
}
2222

2323
group = "nl.codestar"
@@ -45,30 +45,25 @@ tasks {
4545
}
4646

4747
dependencies {
48-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
49-
compile("ch.qos.logback:logback-classic:$logback_version")
50-
compile("io.ktor:ktor-server-netty:$ktor_version") { exclude("io.netty", "netty-codec-http2")}
51-
compile("io.ktor:ktor-server-core:$ktor_version")
52-
compile("io.ktor:ktor-auth:$ktor_version")
53-
compile("io.ktor:ktor-gson:$ktor_version")
54-
compile("io.ktor:ktor-locations:$ktor_version")
55-
compile("io.ktor:ktor-metrics:$ktor_version")
56-
compile("io.ktor:ktor-server-host-common:$ktor_version")
57-
compile("io.ktor:ktor-websockets:$ktor_version")
58-
compile("org.jetbrains.exposed:exposed:0.17.4")
48+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
49+
implementation("ch.qos.logback:logback-classic:$logback_version")
50+
implementation("io.ktor:ktor-server-netty:$ktor_version") { exclude("io.netty", "netty-codec-http2")}
51+
implementation("io.ktor:ktor-server-core:$ktor_version")
52+
implementation("io.ktor:ktor-auth:$ktor_version")
53+
implementation("io.ktor:ktor-gson:$ktor_version")
54+
implementation("io.ktor:ktor-locations:$ktor_version")
55+
implementation("io.ktor:ktor-metrics:$ktor_version")
56+
implementation("io.ktor:ktor-server-host-common:$ktor_version")
57+
implementation("io.ktor:ktor-websockets:$ktor_version")
58+
implementation("org.jetbrains.exposed:exposed:0.17.4")
5959
implementation("software.amazon.kinesis:amazon-kinesis-client:2.2.5"){ exclude("com.amazonaws", "aws-java-sdk-kinesisvideo") }
60-
compile("io.netty:netty-codec-http2:4.1.35.Final")
61-
testCompile("io.ktor:ktor-server-tests:$ktor_version")
60+
implementation("io.netty:netty-codec-http2:4.1.35.Final")
61+
testImplementation("io.ktor:ktor-server-tests:$ktor_version")
6262
testImplementation("io.kotlintest:kotlintest-runner-junit5:3.3.0")
6363
}
6464

6565
kotlin.sourceSets["main"].kotlin.srcDirs("src")
6666
kotlin.sourceSets["test"].kotlin.srcDirs("test")
6767

68-
69-
sourceSets["main"].resources.srcDirs("resources")
70-
sourceSets["test"].resources.srcDirs("testresources")
71-
72-
//tasks.withType<ShadowJar> {
73-
// archiveBaseName.set("${project.name}-all")
74-
//}
68+
project.the<SourceSetContainer>()["main"].resources.srcDirs("resources")
69+
project.the<SourceSetContainer>()["test"].resources.srcDirs("testresources")

‎build.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
plugins {
2+
base
3+
kotlin("jvm") version "1.3.50"
4+
kotlin("kapt") version "1.3.50"
5+
}
6+
7+
allprojects {
8+
repositories {
9+
mavenLocal()
10+
jcenter()
11+
maven { url = uri("https://kotlin.bintray.com/ktor") }
12+
maven { url = uri("https://plugins.gradle.org/m2/") }
13+
}
14+
}

‎data/build.gradle.kts

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ val serialization_version: String by project
77

88
plugins {
99
application
10-
kotlin("jvm") version "1.3.50"
11-
kotlin("kapt") version "1.3.50"
10+
kotlin("jvm")
11+
kotlin("kapt")
1212
}
1313

1414
group = "nl.codestar"
@@ -40,27 +40,26 @@ repositories {
4040
}
4141

4242
dependencies {
43-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
44-
compile("ch.qos.logback:logback-classic:$logback_version")
45-
compile("io.ktor:ktor-server-netty:$ktor_version")
46-
compile("io.ktor:ktor-server-core:$ktor_version")
47-
compile("io.ktor:ktor-auth:$ktor_version")
48-
compile("io.ktor:ktor-gson:$ktor_version")
49-
compile("io.ktor:ktor-locations:$ktor_version")
50-
compile("io.ktor:ktor-metrics:$ktor_version")
51-
compile("io.ktor:ktor-server-host-common:$ktor_version")
52-
compile("io.ktor:ktor-websockets:$ktor_version")
53-
compile("org.jetbrains.exposed:exposed:0.17.4")
54-
compile("io.github.config4k:config4k:0.4.1") // See the `Download` badge
55-
56-
compile("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
57-
compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version")
43+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
44+
implementation("ch.qos.logback:logback-classic:$logback_version")
45+
implementation("io.ktor:ktor-server-netty:$ktor_version")
46+
implementation("io.ktor:ktor-server-core:$ktor_version")
47+
implementation("io.ktor:ktor-auth:$ktor_version")
48+
implementation("io.ktor:ktor-gson:$ktor_version")
49+
implementation("io.ktor:ktor-locations:$ktor_version")
50+
implementation("io.ktor:ktor-metrics:$ktor_version")
51+
implementation("io.ktor:ktor-server-host-common:$ktor_version")
52+
implementation("io.ktor:ktor-websockets:$ktor_version")
53+
implementation("org.jetbrains.exposed:exposed:0.17.4")
54+
implementation("io.github.config4k:config4k:0.4.1") // See the `Download` badge
55+
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
56+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version")
5857
implementation("io.ktor:ktor-client-apache:$ktor_version")
59-
testCompile("io.ktor:ktor-server-tests:$ktor_version")
58+
testImplementation("io.ktor:ktor-server-tests:$ktor_version")
6059
}
6160

6261
kotlin.sourceSets["main"].kotlin.srcDirs("src")
6362
kotlin.sourceSets["test"].kotlin.srcDirs("test")
6463

6564
sourceSets["main"].resources.srcDirs("resources")
66-
sourceSets["test"].resources.srcDirs("testresources")
65+
sourceSets["test"].resources.srcDirs("testresources")

‎gradle/wrapper/gradle-wrapper.jar

53.9 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS='"-Xmx64m"'
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn () {
37+
echo "$*"
38+
}
39+
40+
die () {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)