Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit 21171c6

Browse files
committed
Resructure project
1 parent b043145 commit 21171c6

8 files changed

Lines changed: 167 additions & 38 deletions

.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-navigator.xml

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-navigator/profiles_settings.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/sparkmicroserviceutils_main.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/sparkmicroserviceutils_test.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/sparkmicroserviceutils.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 69 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,102 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.50'
3-
42
repositories {
53
jcenter()
64
}
75
dependencies {
8-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
6+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin"
97
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
108
}
119
}
1210

1311
plugins {
14-
id "java"
15-
id 'org.jetbrains.kotlin.jvm' version "1.2.50"
12+
// Like --scan option to gradle; should be placed before any other plugins
13+
id 'com.gradle.build-scan' version '2.1'
14+
15+
id 'java'
16+
id 'org.jetbrains.kotlin.jvm' version '1.3.21'
17+
18+
// Gradle dependency update checker; run by "dependencyUpdates" task
19+
id "com.github.ben-manes.versions" version "0.20.0"
20+
21+
// Release version with "gradle release"
22+
id 'net.researchgate.release' version '2.6.0'
23+
24+
// Upload and release library to JFrog BinTray
1625
id "com.jfrog.bintray" version "1.8.1"
1726
}
1827

1928
apply plugin: "maven-publish"
2029
apply plugin: "java-library"
2130
apply plugin: 'org.jetbrains.dokka'
2231

23-
compileKotlin {
24-
kotlinOptions.jvmTarget = "1.8"
25-
}
26-
compileTestKotlin {
27-
kotlinOptions.jvmTarget = "1.8"
28-
}
29-
3032
group 'de.debuglevel.sparkmicroserviceutils'
31-
version '0.0.22'
32-
33-
sourceCompatibility = 1.8
3433

3534
repositories {
3635
jcenter()
3736
}
3837

3938
dependencies {
40-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
39+
// Kotlin
40+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
4141

4242
// Tests
43-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0'
44-
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.2.0'
45-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.2.0'
46-
testImplementation 'org.assertj:assertj-core:3.10.0'
43+
testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.0'
44+
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
45+
testCompile 'org.junit.jupiter:junit-jupiter-params:5.4.0'
46+
testCompile 'org.assertj:assertj-core:3.12.0'
4747

4848
// Logging
49-
implementation 'io.github.microutils:kotlin-logging:1.4.9'
50-
51-
// Spark (REST Server)
52-
compileOnly 'com.sparkjava:spark-kotlin:1.0.0-alpha'
49+
// See http://saltnlight5.blogspot.com/2013/08/how-to-configure-slf4j-with-different.html for a quick introduction to slf4j
50+
implementation 'io.github.microutils:kotlin-logging:1.6.25'
51+
implementation 'org.slf4j:slf4j-api:1.7.25'
52+
implementation 'org.slf4j:slf4j-simple:1.7.25'
5353

5454
// Configuration
55-
implementation 'com.natpryce:konfig:1.6.9.0'
55+
implementation "com.natpryce:konfig:1.6.10.0"
56+
57+
// Spark (REST server)
58+
implementation "com.sparkjava:spark-kotlin:1.0.0-alpha"
59+
}
60+
61+
// Java configuration
62+
java {
63+
sourceCompatibility = JavaVersion.VERSION_1_8 // Source is Java 8 code
64+
targetCompatibility = JavaVersion.VERSION_1_8 // Byte code will be JVM 8
65+
}
66+
67+
// Kotlin configuration (implies compileKotlin and compileTestKotlin)
68+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
69+
kotlinOptions {
70+
jvmTarget = JavaVersion.VERSION_1_8 // Byte code will be JVM 8
71+
}
72+
}
73+
74+
// Configuration of com.gradle.build-scan plugin
75+
buildScan {
76+
// Accept the license agreement for com.gradle.build-scan plugin
77+
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
78+
termsOfServiceAgree = 'yes'
79+
80+
// Always publish scan (no more need for --scan option)
81+
publishAlways()
82+
}
83+
84+
// Configuration of net.researchgate.release plugin
85+
release {
86+
failOnCommitNeeded = false
87+
failOnUnversionedFiles = false
88+
}
89+
90+
test {
91+
useJUnitPlatform()
92+
93+
testLogging {
94+
events "passed", "skipped", "failed"
95+
}
96+
97+
reports {
98+
html.enabled = true
99+
}
56100
}
57101

58102
dokka {
@@ -99,16 +143,3 @@ bintray {
99143
vcsUrl = 'https://github.com/debuglevel/sparkmicroserviceutils.git'
100144
}
101145
}
102-
103-
104-
//test {
105-
// useJUnitPlatform()
106-
//
107-
// testLogging {
108-
// events "passed", "skipped", "failed"
109-
// }
110-
//
111-
// reports {
112-
// html.enabled = true
113-
// }
114-
//}

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Application version
2+
version=0.0.23-SNAPSHOT
3+
# other settings
4+
kotlin.code.style=official

0 commit comments

Comments
 (0)