Skip to content

Commit

Permalink
Update dependencies versions
Browse files Browse the repository at this point in the history
  • Loading branch information
kirill-gr committed Apr 3, 2019
1 parent 8534ced commit 7016006
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 17 deletions.
22 changes: 8 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
plugins {
id "org.jetbrains.kotlin.jvm" version "1.2.60"
id "com.gradle.build-scan" version "1.13.1"
id "org.jetbrains.kotlin.jvm" version "1.3.21"
id "com.gradle.build-scan" version "2.2.1"
}

group "ru.grushetsky"
version "NEXT-SNAPSHOT"

ext.kotlin_version = "1.2.60"
ext.junitPlatformVersion = "1.2.0"
ext.junitJupiterVersion = "5.2.0"
ext.antlrVersion = "4.7"
ext.assertJVersion = "3.9.1"
ext.kotlin_version = "1.3.21"
ext.junitPlatformVersion = "1.4.1"
ext.junitJupiterVersion = "5.4.1"
ext.antlrVersion = "4.7.2"
ext.assertJVersion = "3.12.2"
ext.javaVersion = JavaVersion.VERSION_1_8

test {
Expand Down Expand Up @@ -87,19 +87,13 @@ generateGrammarSource {

compileKotlin.dependsOn generateGrammarSource

// earlier versions includes kotlin-generated code into coverage
// should be removed once plugin will use 0.8.2 by default
jacoco {
toolVersion = "0.8.2"
}

jacocoTestReport {
reports {
xml.enabled = true
html.enabled = false
}
afterEvaluate {
classDirectories = files(classDirectories.files.collect {
getClassDirectories().setFrom(classDirectories.files.collect {
fileTree(dir: it, exclude:
['**/M3uParserBaseListener.*',
'**/M3uParser$*.*'])
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down

0 comments on commit 7016006

Please sign in to comment.