Build: Fix usages of deprecated convention in kotlin-native
Required for Gradle 7+ #KTI-559
This commit is contained in:
@@ -61,7 +61,7 @@ ext.target = platformManager.targetManager(project.testTarget).target
|
||||
ext.testLibraryDir = "${ext.testOutputRoot}/klib/platform/${project.target.name}"
|
||||
|
||||
// Add executor to run tests depending on a target
|
||||
project.convention.plugins.executor = ExecutorServiceKt.create(project)
|
||||
project.extensions.executor = ExecutorServiceKt.create(project)
|
||||
|
||||
|
||||
compileTestKotlin {
|
||||
@@ -4710,7 +4710,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
interop = 'objcSmoke'
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/smoke.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcsmoke.dylib"
|
||||
@@ -4735,7 +4735,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
interop = 'objcSmoke'
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/smoke.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcsmoke.dylib"
|
||||
@@ -4773,7 +4773,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args fileTree("$projectDir/interop/objc/tests/") { include '**/*.m' }
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjctests.dylib"
|
||||
@@ -4793,7 +4793,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc_with_initializer/objc_misc.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcmisc.dylib"
|
||||
@@ -4810,7 +4810,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/msg_send/messaging.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcmessaging.dylib"
|
||||
@@ -4828,7 +4828,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/foreignException/objc_wrap.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
|
||||
@@ -4847,7 +4847,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/foreignException/objc_wrap.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
|
||||
@@ -4866,7 +4866,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/foreignException/objc_wrap.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
|
||||
@@ -4909,7 +4909,7 @@ if (PlatformInfo.isAppleTarget(project)) {
|
||||
|
||||
doBeforeBuild {
|
||||
mkdir(buildDir)
|
||||
execClangForCompilerTests(project.target) {
|
||||
project.extensions.execClang.execClangForCompilerTests(project.target) {
|
||||
args "$projectDir/interop/objc/kt42172/objclib.m"
|
||||
args "-lobjc", '-fobjc-arc'
|
||||
args '-fPIC', '-shared', '-o', "$buildDir/libobjc_kt42172.dylib"
|
||||
|
||||
Reference in New Issue
Block a user