1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00

Merge pull request #48 from cypressious/fix_gradle_some_more

Fix build.gradle some more
This commit is contained in:
Cedric Beust 2015-11-23 14:15:53 -08:00
commit 9067872fbf

View file

@ -2,15 +2,10 @@ buildscript {
ext.kotlin_version = '1.0.0-beta-2423' ext.kotlin_version = '1.0.0-beta-2423'
repositories { repositories {
mavenCentral()
jcenter() jcenter()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
} }
} }
@ -22,23 +17,18 @@ version = '0.121'
//apply plugin: 'java' //apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
//apply plugin: 'application'
apply plugin: 'com.jfrog.bintray' apply plugin: 'com.jfrog.bintray'
apply from: 'gradle/publishing.gradle' apply from: 'gradle/publishing.gradle'
repositories { repositories {
mavenCentral()
jcenter() jcenter()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}", compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}",
"org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlin_version}", "org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlin_version}",
'org.jetbrains.kotlinx:kotlinx.dom:0.0.2', 'org.jetbrains.kotlinx:kotlinx.dom:0.0.4',
'org.jetbrains.dokka:dokka-fatjar:0.9.2', 'org.jetbrains.dokka:dokka-fatjar:0.9.2',
// "org.jetbrains.kotlin:kotlin-compiler:${kotlin_version}", // "org.jetbrains.kotlin:kotlin-compiler:${kotlin_version}",
@ -73,10 +63,6 @@ artifacts {
file('build/libs/kobalt.jar') file('build/libs/kobalt.jar')
sourceJar sourceJar
} }
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
}
test { test {
useTestNG() useTestNG()