Skip to content

Commit 1666249

Browse files
committed
Update Gradle wrapper, dependencies. Kotlin compile to Java 1.8 target
1 parent fbe85b0 commit 1666249

5 files changed

Lines changed: 9 additions & 27 deletions

File tree

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.3.0'
18+
ext.kotlin_version = '1.3.61'
1919

2020
repositories {
2121
mavenCentral()
2222
}
2323

2424
dependencies {
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
26-
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.6'
26+
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0'
2727
}
2828
}
2929

@@ -57,19 +57,18 @@ subprojects {
5757

5858
// For Animal Sniffer
5959
if (project.name != 'gradle-plugin') {
60-
signature 'org.codehaus.mojo.signature:java17:1.0@signature'
60+
signature 'org.codehaus.mojo.signature:java18:1.0@signature'
6161
}
6262
}
6363

64-
def targetVersion = project.name != 'gradle-plugin' ? '1.7' : '1.8'
6564
compileJava {
66-
sourceCompatibility = targetVersion
67-
targetCompatibility = targetVersion
65+
sourceCompatibility = '1.8'
66+
targetCompatibility = '1.8'
6867
}
6968

7069
compileKotlin {
7170
kotlinOptions {
72-
jvmTarget = '1.6'
71+
jvmTarget = '1.8'
7372
}
7473
}
7574

gradle/wrapper/gradle-wrapper.jar

1.38 KB
Binary file not shown.
Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
#
2-
# Copyright 2014-2019 the original author or authors.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
17-
#Tue Nov 06 17:37:01 CET 2018
181
distributionBase=GRADLE_USER_HOME
192
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
204
zipStoreBase=GRADLE_USER_HOME
215
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-1-all.zip

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)