Skip to content

Commit 001f7b4

Browse files
authored
Merge pull request #9 from davidpodhola/master
Update to more recent versions
2 parents 35f52b5 + 14de8a7 commit 001f7b4

39 files changed

+668
-464
lines changed

.gitignore

Lines changed: 59 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,64 @@ hs_err_pid*
2727
.classpath
2828
*.launch
2929
.settings/
30-
out/
31-
build/
32-
33-
#Gradle
34-
.gradle/
3530

36-
#System Files
3731
.DS_Store
38-
Thumbs.db
32+
.idea/shelf
33+
/confluence/target
34+
/dependencies/repo
35+
/android.tests.dependencies
36+
/dependencies/android.tests.dependencies
37+
/dist
38+
/local
39+
/gh-pages
40+
/ideaSDK
41+
/clionSDK
42+
/android-studio/sdk
43+
out/
44+
/tmp
45+
/intellij
46+
workspace.xml
47+
*.versionsBackup
48+
/idea/testData/debugger/tinyApp/classes*
49+
/jps-plugin/testData/kannotator
50+
/js/js.translator/testData/out/
51+
/js/js.translator/testData/out-min/
52+
/js/js.translator/testData/out-pir/
53+
.gradle/
54+
build/
55+
!**/src/**/build
56+
!**/test/**/build
57+
*.iml
58+
!**/testData/**/*.iml
59+
.idea/artifacts
60+
.idea/remote-targets.xml
61+
.idea/libraries/Gradle*.xml
62+
.idea/libraries/Maven*.xml
63+
.idea/modules
64+
.idea/runConfigurations/JPS_*.xml
65+
.idea/runConfigurations/_JPS_*.xml
66+
.idea/runConfigurations/PILL_*.xml
67+
.idea/runConfigurations/_FP_*.xml
68+
.idea/runConfigurations/_MT_*.xml
69+
.idea/libraries
70+
.idea/modules.xml
71+
.idea/gradle.xml
72+
.idea/compiler.xml
73+
.idea/inspectionProfiles/profiles_settings.xml
74+
.idea/.name
75+
.idea/jarRepositories.xml
76+
.idea/csv-plugin.xml
77+
.idea/libraries-with-intellij-classes.xml
78+
.idea/misc.xml
79+
.idea/protoeditor.xml
80+
.idea/
81+
node_modules/
82+
.rpt2_cache/
83+
libraries/tools/kotlin-test-js-runner/lib/
84+
local.properties
85+
buildSrcTmp/
86+
distTmp/
87+
outTmp/
88+
/test.output
89+
/kotlin-native/dist
90+
kotlin-ide/

build.gradle

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@ group 'io.realworld'
22
version '1.0-SNAPSHOT'
33

44
ext {
5-
javalin_version = "3.8.0"
6-
jackson_version = "2.10.1"
7-
slf4j_version = "1.7.28"
5+
javalin_version = "4.6.1"
6+
jackson_version = "2.13.5"
7+
slf4j_version = "2.0.9"
8+
// not easy to update
89
koin_version = "1.0.2"
910
junit_version = "4.12"
1011
unirest_version = "1.4.9"
1112
auth0_jwt_version = "3.4.1"
1213
hikaricp_version = "3.3.0"
1314
h2_version = "1.4.197"
14-
exposed_version = "0.11.1"
15+
exposed_version = "0.17.14"
1516
slugify_version = "2.1.+"
1617
swagger_version = "3.24.3"
1718
swagger_core_version = "2.0.9"
19+
pgsql_version = "42.6.0"
1820
}
1921

2022
buildscript {
21-
ext.kotlin_version = "1.3.+"
23+
ext.kotlin_version = "1.5.31"
2224

2325
repositories {
2426
mavenCentral()
@@ -41,26 +43,34 @@ repositories {
4143
dependencies {
4244
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
4345
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
44-
compile "io.javalin:javalin:$javalin_version"
45-
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
46-
compile "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
47-
compile "org.slf4j:slf4j-simple:$slf4j_version"
48-
compile "org.koin:koin-core:$koin_version"
49-
compile "com.auth0:java-jwt:$auth0_jwt_version"
50-
compile "com.zaxxer:HikariCP:$hikaricp_version"
51-
compile "com.h2database:h2:$h2_version"
52-
compile "org.jetbrains.exposed:exposed:$exposed_version"
53-
compile "com.github.slugify:slugify:$slugify_version"
54-
compile "org.webjars:swagger-ui:$swagger_version"
55-
compile "io.swagger.core.v3:swagger-core:$swagger_core_version"
46+
implementation "io.javalin:javalin:$javalin_version"
47+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
48+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
49+
implementation "org.slf4j:slf4j-simple:$slf4j_version"
50+
implementation "org.koin:koin-core:$koin_version"
51+
implementation "com.auth0:java-jwt:$auth0_jwt_version"
52+
implementation "com.zaxxer:HikariCP:$hikaricp_version"
53+
implementation "com.h2database:h2:$h2_version"
54+
implementation "org.jetbrains.exposed:exposed:$exposed_version"
55+
implementation "com.github.slugify:slugify:$slugify_version"
56+
implementation "org.webjars:swagger-ui:$swagger_version"
57+
implementation "io.swagger.core.v3:swagger-core:$swagger_core_version"
5658

57-
testCompile "junit:junit:$junit_version"
58-
testCompile "com.mashape.unirest:unirest-java:$unirest_version"
59+
testImplementation "junit:junit:$junit_version"
60+
testImplementation "com.mashape.unirest:unirest-java:$unirest_version"
61+
62+
runtimeOnly "org.postgresql:postgresql:$pgsql_version"
5963
}
6064

6165
compileKotlin {
62-
kotlinOptions.jvmTarget = "1.8"
66+
kotlinOptions {
67+
jvmTarget = "16"
68+
languageVersion = "1.4"
69+
}
6370
}
6471
compileTestKotlin {
65-
kotlinOptions.jvmTarget = "1.8"
72+
kotlinOptions {
73+
jvmTarget = "16"
74+
languageVersion = "1.4"
75+
}
6676
}

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip

0 commit comments

Comments
 (0)