azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use deprecated DSL in tests

Browse Source
This commit is contained in:
Ilya Matveev
2018-09-19 12:22:50 +03:00
committed by Ilya Matveev
parent c8af254620
commit e4f2165b16
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt
+2 -3
View File
@@ -118,10 +118,9 @@ open class KotlinNativeCompile @Inject constructor(internal val binary: Abstract
} }
} }
// initializing AbstractCompile properties // Initializing AbstractCompile properties.
init { init {
@Suppress("LeakingThis") this.setDestinationDir(project.provider {
setDestinationDir(project.provider {
if (outputFile.isDirectory) outputFile else outputFile.parentFile if (outputFile.isDirectory) outputFile else outputFile.parentFile
}) })
sourceCompatibility = "1.6" sourceCompatibility = "1.6"
tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt
+10 -10
View File
@@ -125,7 +125,7 @@ class ExperimentalPluginTests {
version '1.0' version '1.0'
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
publishing { publishing {
@@ -159,7 +159,7 @@ class ExperimentalPluginTests {
} }
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
outputKinds = [ EXECUTABLE ] outputKinds = [ EXECUTABLE ]
} }
""".trimIndent()) """.trimIndent())
@@ -226,7 +226,7 @@ class ExperimentalPluginTests {
plugins { id 'kotlin-native' } plugins { id 'kotlin-native' }
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
dependencies { dependencies {
@@ -241,7 +241,7 @@ class ExperimentalPluginTests {
plugins { id 'kotlin-native'} plugins { id 'kotlin-native'}
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
""".trimIndent()) """.trimIndent())
@@ -257,7 +257,7 @@ class ExperimentalPluginTests {
plugins { id 'kotlin-native' } plugins { id 'kotlin-native' }
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
outputKinds = [ EXECUTABLE ] outputKinds = [ EXECUTABLE ]
} }
@@ -295,7 +295,7 @@ class ExperimentalPluginTests {
version '1.0' version '1.0'
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
dependencies { dependencies {
@@ -324,7 +324,7 @@ class ExperimentalPluginTests {
version '1.0' version '1.0'
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
publishing { publishing {
@@ -359,7 +359,7 @@ class ExperimentalPluginTests {
} }
sourceSets.main.component { sourceSets.main.component {
target 'host', 'wasm32' targets = ['host', 'wasm32']
outputKinds = [ EXECUTABLE ] outputKinds = [ EXECUTABLE ]
} }
""".trimIndent()) """.trimIndent())
@@ -444,7 +444,7 @@ class ExperimentalPluginTests {
sourceSets.main { sourceSets.main {
component { component {
outputKinds = [ EXECUTABLE, KLIBRARY, FRAMEWORK ] outputKinds = [ EXECUTABLE, KLIBRARY, FRAMEWORK ]
target 'host', 'wasm32' targets = ['host', 'wasm32']
} }
} }
@@ -498,7 +498,7 @@ class ExperimentalPluginTests {
sourceSets.main { sourceSets.main {
component { component {
outputKinds = [ DYNAMIC, STATIC ] outputKinds = [ DYNAMIC, STATIC ]
target 'host' targets = ['host']
} }
} }