Skip to content

Commit

Permalink
Move kotlin extensions to reactor-kotlin-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephane Maldini committed May 7, 2019
1 parent dfd1a5a commit ca0c90c
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 1,461 deletions.
26 changes: 3 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
*/

buildscript {
ext.kotlinVersion = '1.1.61'
repositories {
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}",
'org.springframework.build.gradle:propdeps-plugin:0.0.7',
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7',
'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE'
}
}
Expand Down Expand Up @@ -78,7 +76,6 @@ configure(subprojects) { project ->

apply plugin: 'propdeps'
apply plugin: 'java'
apply plugin: 'kotlin'
apply from: "${gradleScriptDir}/ide.gradle"

[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:varargs",
Expand Down Expand Up @@ -111,22 +108,6 @@ configure(subprojects) { project ->
targetCompatibility = 1.8
}

compileKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xjsr305=strict"]
}

compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xjsr305=strict"]
}

// now that kotlin-gradle-plugin 1.1.60 is out with fix for https://youtrack.jetbrains.com/issue/KT-17564
// be wary and fail if the issue of source file duplication in jar comes up again
sourcesJar {
duplicatesStrategy = DuplicatesStrategy.FAIL
}

if (JavaVersion.current().isJava8Compatible()) {
compileTestJava.options.compilerArgs += "-parameters"
tasks.withType(Javadoc) {
Expand Down Expand Up @@ -210,8 +191,6 @@ project('reactor-adapter') {

optional "com.typesafe.akka:akka-actor_2.11:$akkaActorVersion"

optional "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"

testCompile "org.reactivestreams:reactive-streams-tck:1.0.2"
}

Expand All @@ -234,7 +213,8 @@ project('reactor-extra') {

dependencies {
optional "org.eclipse.swt:org.eclipse.swt.${getPlatform()}:${swtVersionPlatform}"
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile "org.reactivestreams:reactive-streams-tck:1.0.2"
testCompile "org.mockito:mockito-core:2.23.0"
}

jar {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit ca0c90c

Please sign in to comment.