Skip to content

Commit efb2861

Browse files
author
ehennum
committed
update compatibility in build.gradle files #1114
1 parent d88ebb0 commit efb2861

File tree

2 files changed

+49
-52
lines changed

2 files changed

+49
-52
lines changed

build.gradle

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
subprojects {
2-
apply plugin: 'java'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'jacoco'
5-
jacoco{toolVersion="0.7.4.201502262128"}
6-
7-
configure(allprojects){
8-
ext.slf4jVersion = '1.7.25'
9-
ext.logbackVersion = '1.2.3'
10-
}
11-
tasks.withType(JavaCompile) {
12-
options.encoding = 'UTF-8'
13-
}
14-
sourceCompatibility = "1.8"
15-
targetCompatibility = "1.8"
16-
17-
sourceSets {
18-
test.compileClasspath += configurations.compileOnly
19-
test.runtimeClasspath += configurations.compileOnly
20-
}
21-
22-
repositories {
23-
mavenLocal()
24-
mavenCentral()
25-
jcenter()
26-
maven { url "http://repo.maven.apache.org/maven2" }
27-
}
28-
29-
dependencies {
30-
testCompile group: 'junit', name: 'junit', version:'4.12'
31-
testCompile group: 'xmlunit', name: 'xmlunit', version:'1.6'
32-
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version:'3.7'
33-
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5.3'
34-
}
35-
36-
test {
37-
systemProperty "file.encoding", "UTF-8"
38-
systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
39-
}
40-
}
41-
42-
task wrapper(type: Wrapper) {
43-
gradleVersion = '4.5.1'
44-
}
1+
subprojects {
2+
apply plugin: 'java'
3+
apply plugin: 'eclipse'
4+
apply plugin: 'jacoco'
5+
jacoco{toolVersion="0.7.4.201502262128"}
6+
7+
configure(allprojects){
8+
ext.slf4jVersion = '1.7.25'
9+
ext.logbackVersion = '1.2.3'
10+
}
11+
tasks.withType(JavaCompile) {
12+
options.encoding = 'UTF-8'
13+
}
14+
sourceCompatibility = "9"
15+
targetCompatibility = "9"
16+
17+
sourceSets {
18+
test.compileClasspath += configurations.compileOnly
19+
test.runtimeClasspath += configurations.compileOnly
20+
}
21+
22+
repositories {
23+
mavenLocal()
24+
mavenCentral()
25+
jcenter()
26+
maven { url "http://repo.maven.apache.org/maven2" }
27+
}
28+
29+
dependencies {
30+
testCompile group: 'junit', name: 'junit', version:'4.12'
31+
testCompile group: 'xmlunit', name: 'xmlunit', version:'1.6'
32+
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version:'3.7'
33+
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5.3'
34+
}
35+
36+
test {
37+
systemProperty "file.encoding", "UTF-8"
38+
systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
39+
}
40+
}
41+
42+
task wrapper(type: Wrapper) {
43+
gradleVersion = '4.5.1'
44+
}

ml-development-tools/build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'java-gradle-plugin'
44
id 'maven-publish'
55
id 'com.gradle.plugin-publish' version '0.10.0'
6-
id 'org.jetbrains.kotlin.jvm' version '1.2.51'
6+
id 'org.jetbrains.kotlin.jvm' version '1.3.31'
77
}
88

99
apply plugin: 'kotlin'
@@ -14,9 +14,6 @@ apply plugin: 'maven-publish'
1414
//group 'com.marklogic'
1515
//version '4.1'
1616

17-
sourceCompatibility = '1.8'
18-
targetCompatibility = '1.8'
19-
2017
repositories {
2118
jcenter()
2219
mavenCentral()
@@ -26,8 +23,8 @@ repositories {
2623
dependencies {
2724
compileOnly gradleApi()
2825
compile project (':marklogic-client-api')
29-
compile ('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.51')
30-
compile ('com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8')
26+
compile ('org.jetbrains.kotlin:kotlin-stdlib:1.3.31')
27+
compile ('com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9')
3128
testCompileOnly gradleTestKit()
3229
}
3330

@@ -57,10 +54,10 @@ pluginBundle {
5754
}
5855

5956
compileKotlin {
60-
kotlinOptions.jvmTarget = '1.8'
57+
kotlinOptions.jvmTarget = '9'
6158
}
6259
compileTestKotlin {
63-
kotlinOptions.jvmTarget = '1.8'
60+
kotlinOptions.jvmTarget = '9'
6461
}
6562

6663
task setupTestServer(type: JavaExec) {

0 commit comments

Comments
 (0)