Skip to content

Commit

Permalink
Upgrade to Kotlin 1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
raniejade committed Jan 5, 2017
1 parent 92f05e5 commit 70f11eb
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,4 +1,4 @@
kotlinVersion=1.0.4
kotlinVersion=1.0.6
junitPlatformVersion=1.0.0-M3
kotlin.incremental=true
githubRepo=https://github.com/JetBrains/spek
Expand Down
46 changes: 44 additions & 2 deletions spek-dist/build.gradle
Expand Up @@ -73,6 +73,48 @@ publishing {
}
}

subjectExtension(MavenPublication) {
groupId = 'org.jetbrains.spek'
artifactId = 'spek-subject-extension'
version = rootProject.version

from project(':spek-subject-extension').components.java
artifact project(':spek-subject-extension').tasks['sourceJar']
artifact project(':spek-subject-extension').tasks['javadocJar']

pom.withXml {
asNode().dependencies.dependency.each {
it.scope[0].value = ('compile')
}

asNode().children().last() + {
resolveStrategy = DELEGATE_FIRST
name 'Spek'
description 'A Specification Framework for the JVM'
url 'https://jetbrains.github.io/spek'
licenses {
license {
name 'BSD New'
url 'https://github.com/JetBrains/spek/blob/master/LICENSE.TXT'
distribution 'spek'
}
}
developers {
developer {
id 'JetBrains'
name 'Spek Contributors'
organization 'JetBrains'
}
}
scm {
connection 'scm:git:git://github.com/jetbrains/spek.git'
developerConnection 'scm:git:https://github.com/jetbrains/spek.git'
url 'http://github.com/jetbrains/spek'
}
}
}
}

engine(MavenPublication) {
groupId = 'org.jetbrains.spek'
artifactId = 'spek-junit-platform-engine'
Expand Down Expand Up @@ -139,7 +181,7 @@ bintray {
}
}

publications = ['api', 'engine']
publications = ['api', 'engine', 'subjectExtension']
}

artifactory {
Expand All @@ -155,7 +197,7 @@ artifactory {
maven = true
}
defaults {
publications('api', 'engine')
publications('api', 'engine', 'subjectExtension')
}
}
resolve {
Expand Down

0 comments on commit 70f11eb

Please sign in to comment.