Skip to content

Commit 95bae11

Browse files
asurkovanatolystansler
authored andcommitted
build - bump kotlin version up to support Java 10 (#256)
* build - bump kotlin version up to support Java 10 * fix: handling of java 10 and raise of critical v of jackson
1 parent 7b64154 commit 95bae11

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2017 Sourcerer Inc. All Rights Reserved.
22

33
buildscript {
4-
ext.kotlin_version = '1.1.51'
4+
ext.kotlin_version = '1.2.31'
55
repositories {
66
mavenCentral()
77
jcenter()
@@ -95,17 +95,17 @@ dependencies {
9595
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
9696
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
9797
compile "com.beust:jcommander:1.72"
98-
compile 'com.google.protobuf:protobuf-java:3.4.0'
98+
compile 'com.google.protobuf:protobuf-java:3.5.1'
9999
compile 'commons-codec:commons-codec:1.5'
100-
compile 'com.fasterxml.jackson.core:jackson-databind:2.8.9'
101-
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9'
102-
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.9'
103-
compile 'io.reactivex.rxjava2:rxjava:2.1.6'
104-
compile 'com.github.kittinunf.fuel:fuel:1.11.0'
105-
compile 'com.github.kittinunf.fuel:fuel-rxjava:1.11.0'
100+
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5'
101+
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.5'
102+
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.5'
103+
compile 'io.reactivex.rxjava2:rxjava:2.1.12'
104+
compile 'com.github.kittinunf.fuel:fuel:1.12.1'
105+
compile 'com.github.kittinunf.fuel:fuel-rxjava:1.12.1'
106106
compile 'org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r'
107107
compile 'org.slf4j:slf4j-nop:1.7.2'
108-
compile 'io.sentry:sentry:1.6.0'
108+
compile 'io.sentry:sentry:1.7.3'
109109

110110
testCompile 'org.jetbrains.kotlin:kotlin-test'
111111
testCompile 'org.jetbrains.spek:spek-api:1.1.5'
@@ -115,7 +115,7 @@ dependencies {
115115

116116
protobuf {
117117
protoc {
118-
artifact = "com.google.protobuf:protoc:3.4.0"
118+
artifact = "com.google.protobuf:protoc:3.5.1"
119119
}
120120
}
121121

src/install/install

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ fi
4545
VERSION=0
4646
if which java > /dev/null ; then
4747
VERSION_STR=\$(java -version 2>&1 | awk -F '"' '/version/ {print \$2}')
48-
if [[ "\$VERSION_STR" > "9." ]]; then # Format: 9.0.1
48+
if [[ "\$VERSION_STR" = "10" || "\$VERSION_STR" > "10" ]]; then # Format: 10
49+
VERSION=10
50+
elif [[ "\$VERSION_STR" > "9." ]]; then # Format: 9.0.1
4951
VERSION=9
5052
elif [[ "\$VERSION_STR" > "1.8." ]]; then # Format: 1.8.1
5153
VERSION=8
@@ -65,8 +67,8 @@ if [ \$VERSION = 0 ] ; then
6567
exit 1
6668
fi
6769
68-
# Java 9 requires additional parameters.
69-
if [ \$VERSION = 9 ] ; then
70+
# Java 9 and 10 requires additional parameters.
71+
if [[ \$VERSION = 9 || \$VERSION = 10 ]] ; then
7072
java --add-modules java.activation --add-opens java.base/java.nio=ALL-UNNAMED -jar $JAR_DIR/sourcerer.jar "\$@"
7173
else
7274
java -jar $JAR_DIR/sourcerer.jar "\$@"

0 commit comments

Comments
 (0)