From 9777888ed4bbb73fa36118021064c29cb492e292 Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Sat, 5 Jun 2021 14:12:25 +0300 Subject: [PATCH] Remove redundant use of mac and windows binaries --- .../tools/kotlin-dokka-stdlib/build-docs.xml | 2 -- .../tools/kotlin-dokka-stdlib/build.gradle | 2 -- .../kotlin_native/build.gradle | 18 +----------------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libraries/tools/kotlin-dokka-stdlib/build-docs.xml b/libraries/tools/kotlin-dokka-stdlib/build-docs.xml index ef7cbb8bf24..32fb73d3030 100644 --- a/libraries/tools/kotlin-dokka-stdlib/build-docs.xml +++ b/libraries/tools/kotlin-dokka-stdlib/build-docs.xml @@ -15,8 +15,6 @@ - - diff --git a/libraries/tools/kotlin-dokka-stdlib/build.gradle b/libraries/tools/kotlin-dokka-stdlib/build.gradle index 2d0ccb9406e..4914cb461e7 100644 --- a/libraries/tools/kotlin-dokka-stdlib/build.gradle +++ b/libraries/tools/kotlin-dokka-stdlib/build.gradle @@ -74,7 +74,5 @@ setupCallDokka.doLast { "-Dkotlin_libs=${pKotlinBig().kotlin_libs}", "-Dkotlin_native_root=${pKotlinNative().kotlin_native_root}", "-Dkotlin_native_linux=${pKotlinNative().kotlin_native_bin_linux}", - "-Dkotlin_native_windows=${pKotlinNative().kotlin_native_bin_windows}", - "-Dkotlin_native_mac=${pKotlinNative().kotlin_native_bin_mac}", ] } diff --git a/libraries/tools/kotlin-dokka-stdlib/kotlin_native/build.gradle b/libraries/tools/kotlin-dokka-stdlib/kotlin_native/build.gradle index b0ba2969858..396f0139eca 100644 --- a/libraries/tools/kotlin-dokka-stdlib/kotlin_native/build.gradle +++ b/libraries/tools/kotlin-dokka-stdlib/kotlin_native/build.gradle @@ -35,8 +35,6 @@ if (useBuildServer) { configurations { kotlin_native_linux - kotlin_native_mac - kotlin_native_windows } def kotlinNativeDep(String target, String ext) { @@ -47,8 +45,6 @@ def kotlinNativeDep(String target, String ext) { dependencies { kotlin_native_linux kotlinNativeDep("linux", "tar.gz") - kotlin_native_mac kotlinNativeDep("macos", "tar.gz") - kotlin_native_windows kotlinNativeDep("windows", "zip") } final File kotlin_native_dir = new File(buildDir, "kotlin_native") @@ -58,16 +54,6 @@ task extractKotlinNativeBinariesLinux(type: Sync) { into new File(kotlin_native_dir, 'linux') } -task extractKotlinNativeBinariesMac(type: Sync) { - from { tarTree(resources.gzip(configurations.kotlin_native_mac.singleFile)) } - into new File(kotlin_native_dir, 'mac') -} - -task extractKotlinNativeBinariesWindows(type: Sync) { - from { zipTree(configurations.kotlin_native_windows.singleFile) } - into new File(kotlin_native_dir, 'windows') -} - final File teamCityBuildInfo = new File(buildDir, "kotlin-native-build-${kotlin_native_build}.xml") final String teamCityBuildsURL = "$buildServer/guestAuth/app/rest/builds/buildType:${kotlin_native_build_configuration},branch:default:any,number:${kotlin_native_build}" @@ -132,9 +118,7 @@ task extractKotlinNativeSources(type: Sync, dependsOn: downloadKotlinNativeSourc } } -task extractKotlinNative(dependsOn: [extractKotlinNativeSources, extractKotlinNativeBinariesLinux, extractKotlinNativeBinariesMac, extractKotlinNativeBinariesWindows]) {} +task extractKotlinNative(dependsOn: [extractKotlinNativeSources, extractKotlinNativeBinariesLinux]) {} project.extensions.kotlin_native_root = findProperty("kotlinLocalRoot") == null ? kotlinTargetDir : findProperty("kotlinLocalRoot") + "/kotlin-native" project.extensions.kotlin_native_bin_linux = new File(kotlin_native_dir, "linux/kotlin-native-linux-${kotlin_native_version}") -project.extensions.kotlin_native_bin_mac = new File(kotlin_native_dir, "mac/kotlin-native-mac-${kotlin_native_version}") -project.extensions.kotlin_native_bin_windows = new File(kotlin_native_dir, "windows/kotlin-native-windows-${kotlin_native_version}")