From 4f0633412df8a18eaf554ba9d636f351a6f9999c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov <41585329+ddolovov@users.noreply.github.com> Date: Tue, 30 Oct 2018 15:03:53 +0700 Subject: [PATCH] Samples: Don't call MPPTools from 'kotlin {}' block. #2277 (#2280) --- samples/buildSrc/src/main/kotlin/MPPTools.kt | 6 +----- samples/csvparser/build.gradle | 5 ++++- samples/curl/build.gradle | 10 +++------- samples/echoServer/build.gradle | 5 ++++- samples/gitchurn/build.gradle | 8 +++----- samples/globalState/build.gradle | 5 ++++- samples/gtk/build.gradle | 8 +++----- samples/libcurl/build.gradle | 8 +++----- samples/nonBlockingEchoServer/build.gradle | 8 +++----- samples/objc/build.gradle | 5 ++++- samples/opengl/build.gradle | 5 ++++- samples/tensorflow/build.gradle | 5 ++++- samples/tetris/build.gradle | 2 +- samples/torch/build.gradle | 5 ++++- samples/videoplayer/build.gradle | 8 +++----- samples/win32/build.gradle | 5 ++++- samples/workers/build.gradle | 5 ++++- 17 files changed, 56 insertions(+), 47 deletions(-) diff --git a/samples/buildSrc/src/main/kotlin/MPPTools.kt b/samples/buildSrc/src/main/kotlin/MPPTools.kt index d3175f254b7..1f7ae4b6c26 100644 --- a/samples/buildSrc/src/main/kotlin/MPPTools.kt +++ b/samples/buildSrc/src/main/kotlin/MPPTools.kt @@ -52,14 +52,10 @@ fun defaultHostPreset( else -> null } - val preset = if (presetCandidate != null && presetCandidate in whitelist) + return if (presetCandidate != null && presetCandidate in whitelist) presetCandidate else throw Exception("Host OS '$hostOs' is not supported in Kotlin/Native ${subproject.displayName}.") - - subproject.ext.set("hostPreset", preset) - - return preset } // A short-cut to add a Kotlin/Native run task. diff --git a/samples/csvparser/build.gradle b/samples/csvparser/build.gradle index 734da2f66da..b9851a9813a 100644 --- a/samples/csvparser/build.gradle +++ b/samples/csvparser/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project), 'csvParser') { + fromPreset(hostPreset, 'csvParser') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.csvparser.main' } diff --git a/samples/curl/build.gradle b/samples/curl/build.gradle index 96a57748fba..6b7692dab71 100644 --- a/samples/curl/build.gradle +++ b/samples/curl/build.gradle @@ -1,5 +1,3 @@ -import java.nio.file.Paths - plugins { id 'kotlin-multiplatform' } @@ -10,12 +8,10 @@ repositories { maven { url = "file://$localRepo" } } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) +kotlin { targets { fromPreset(hostPreset, 'curl') { compilations.main.outputKinds 'EXECUTABLE' diff --git a/samples/echoServer/build.gradle b/samples/echoServer/build.gradle index b77542d36e8..c0cc567744f 100644 --- a/samples/echoServer/build.gradle +++ b/samples/echoServer/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project), 'echoServer') { + fromPreset(hostPreset, 'echoServer') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.echoserver.main' } diff --git a/samples/gitchurn/build.gradle b/samples/gitchurn/build.gradle index f497a8cdac2..9f939a67df5 100644 --- a/samples/gitchurn/build.gradle +++ b/samples/gitchurn/build.gradle @@ -2,12 +2,10 @@ plugins { id 'kotlin-multiplatform' } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) +kotlin { targets { fromPreset(hostPreset, 'gitChurn') { compilations.main.outputKinds 'EXECUTABLE' diff --git a/samples/globalState/build.gradle b/samples/globalState/build.gradle index 1bedca23aab..ef9b245df9f 100644 --- a/samples/globalState/build.gradle +++ b/samples/globalState/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project), 'globalState') { + fromPreset(hostPreset, 'globalState') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.globalstate.main' compilations.main.cinterops { diff --git a/samples/gtk/build.gradle b/samples/gtk/build.gradle index b50de36c5e4..1b1ad0e69ee 100644 --- a/samples/gtk/build.gradle +++ b/samples/gtk/build.gradle @@ -2,12 +2,10 @@ plugins { id 'kotlin-multiplatform' } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) +kotlin { targets { fromPreset(hostPreset, 'gtk') { compilations.main.outputKinds 'EXECUTABLE' diff --git a/samples/libcurl/build.gradle b/samples/libcurl/build.gradle index 8e581ce9e40..fe2df8f352b 100644 --- a/samples/libcurl/build.gradle +++ b/samples/libcurl/build.gradle @@ -20,12 +20,10 @@ task cleanLocalRepo(type: Delete) { delete localRepo } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) +kotlin { targets { fromPreset(hostPreset, 'libcurl') { compilations.main.cinterops { diff --git a/samples/nonBlockingEchoServer/build.gradle b/samples/nonBlockingEchoServer/build.gradle index 659e1e8f911..41eb99b0ac0 100644 --- a/samples/nonBlockingEchoServer/build.gradle +++ b/samples/nonBlockingEchoServer/build.gradle @@ -2,12 +2,10 @@ plugins { id 'kotlin-multiplatform' } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) +kotlin { targets { fromPreset(hostPreset, 'nonBlockingEchoServer') { compilations.main.outputKinds 'EXECUTABLE' diff --git a/samples/objc/build.gradle b/samples/objc/build.gradle index 11e2730d7db..df54bf7da85 100644 --- a/samples/objc/build.gradle +++ b/samples/objc/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64]) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project, [presets.macosX64]), 'objc') { + fromPreset(hostPreset, 'objc') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.objc.main' } diff --git a/samples/opengl/build.gradle b/samples/opengl/build.gradle index 0d290fbd88f..7f173b56e6d 100644 --- a/samples/opengl/build.gradle +++ b/samples/opengl/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64]) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project, [presets.macosX64]), 'opengl') { + fromPreset(hostPreset, 'opengl') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.opengl.main' } diff --git a/samples/tensorflow/build.gradle b/samples/tensorflow/build.gradle index 39e83485ca9..d4006547e68 100644 --- a/samples/tensorflow/build.gradle +++ b/samples/tensorflow/build.gradle @@ -4,9 +4,12 @@ plugins { def tensorflowHome = "${MPPTools.kotlinNativeDataPath()}/third-party/tensorflow" +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project, [presets.macosX64, presets.linuxX64]), 'tensorflow') { + fromPreset(hostPreset, 'tensorflow') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.tensorflow.main' compilations.main.linkerOpts "-L$tensorflowHome/lib", '-ltensorflow' diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle index a15772dab9c..d92b4469b70 100644 --- a/samples/tetris/build.gradle +++ b/samples/tetris/build.gradle @@ -3,7 +3,7 @@ plugins { } File winCompiledResourceFile = file("$buildDir/compiledWindowsResources/Tetris.res") -project.ext.hostPreset = determinePreset() +def hostPreset = determinePreset() kotlin { targets { diff --git a/samples/torch/build.gradle b/samples/torch/build.gradle index c7716ac4c05..027cb43f740 100644 --- a/samples/torch/build.gradle +++ b/samples/torch/build.gradle @@ -4,9 +4,12 @@ plugins { def torchHome = "${MPPTools.kotlinNativeDataPath()}/third-party/torch" +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64]) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project, [presets.macosX64, presets.linuxX64]), 'torch') { + fromPreset(hostPreset, 'torch') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.torch.main' compilations.main.linkerOpts "-L$torchHome/lib", '-lATen' diff --git a/samples/videoplayer/build.gradle b/samples/videoplayer/build.gradle index f5abf938e98..15740df5d9f 100644 --- a/samples/videoplayer/build.gradle +++ b/samples/videoplayer/build.gradle @@ -2,12 +2,10 @@ plugins { id 'kotlin-multiplatform' } -kotlin { - presets { - // Determine host preset. - MPPTools.defaultHostPreset(project, [macosX64, linuxX64, mingwX64]) - } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.macosX64, kotlin.presets.linuxX64, kotlin.presets.mingwX64]) +kotlin { targets { fromPreset(hostPreset, 'videoPlayer') { compilations.main.outputKinds 'EXECUTABLE' diff --git a/samples/win32/build.gradle b/samples/win32/build.gradle index c1f2113a36a..d33a5510992 100644 --- a/samples/win32/build.gradle +++ b/samples/win32/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project, [kotlin.presets.mingwX64]) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project, [presets.mingwX64]), 'win32') { + fromPreset(hostPreset, 'win32') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.win32.main' compilations.main.linkerOpts '-Wl,--subsystem,windows' diff --git a/samples/workers/build.gradle b/samples/workers/build.gradle index d34dfc21d32..4b07d3eab66 100644 --- a/samples/workers/build.gradle +++ b/samples/workers/build.gradle @@ -2,9 +2,12 @@ plugins { id 'kotlin-multiplatform' } +// Determine host preset. +def hostPreset = MPPTools.defaultHostPreset(project) + kotlin { targets { - fromPreset(MPPTools.defaultHostPreset(project), 'workers') { + fromPreset(hostPreset, 'workers') { compilations.main.outputKinds 'EXECUTABLE' compilations.main.entryPoint 'sample.workers.main' }