Skip to content

Commit

Permalink
gradleVersion = '3.5.1';
Browse files Browse the repository at this point in the history
kotlinOptions {
    languageVersion = '1.2'
    apiVersion = '1.2'
}
  • Loading branch information
penemue committed Nov 22, 2018
1 parent 8201475 commit 301e44f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 24 deletions.
57 changes: 38 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,34 @@ def signingKeyId = hasProperty('signingKeyId') ? project.signingKeyId : ''
def signingPassword = hasProperty('signingPassword') ? project.signingPassword : ''
def signingSecretKeyRingFile = hasProperty('signingSecretKeyRingFile') ? project.signingSecretKeyRingFile : ''

task wrapper(type: Wrapper) {
gradleVersion = '3.5.1'
}

defaultTasks 'clean', 'build'

apply plugin: 'kotlin'
apply plugin: 'org.jetbrains.dokka'
apply plugin: 'maven'
apply plugin: 'signing'

defaultTasks 'clean', 'build'

task wrapper(type: Wrapper) {
gradleVersion = '3.3'
license {
header rootProject.file('copyright.ftl')
strictCheck true
ext.inceptionYear = 2016
ext.year = Calendar.getInstance().get(Calendar.YEAR)
ext.owner = 'Vyacheslav Lukianov'
ext.ownerURL = 'https://github.com/penemue'
include "**/*.kt"
mapping {
kt = 'JAVADOC_STYLE'
}
}

repositories {
jcenter()
}

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testCompile group: 'junit', name: 'junit', version: '4.12'
}

test {
// uncomment the following line in order to test mergeSort instead of timSort
//jvmArgs = ['-Djava.util.Arrays.useLegacyMergeSort=true']
Expand All @@ -62,16 +70,27 @@ jmh {
forceGC = true
}

license {
header rootProject.file('copyright.ftl')
strictCheck true
ext.inceptionYear = 2016
ext.year = Calendar.getInstance().get(Calendar.YEAR)
ext.owner = 'Vyacheslav Lukianov'
ext.ownerURL = 'https://github.com/penemue'
include "**/*.kt"
mapping {
kt = 'JAVADOC_STYLE'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testCompile group: 'junit', name: 'junit', version: '4.12'
}

compileKotlin {
kotlinOptions {
languageVersion = '1.2'
apiVersion = '1.2'
}
}
compileTestKotlin {
kotlinOptions {
languageVersion = '1.2'
apiVersion = '1.2'
}
}
dokka {
jdkVersion = 7
packageOptions {
reportUndocumented = false
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun Mar 19 19:28:44 MSK 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit 301e44f

Please sign in to comment.