[Build, K/N] Remove registration and usages of convention.plugins.platformInfo

The entire concept of conventions is deprecated in Gradle. Here it was making the build logic implicit and hard for understanding
^KTI-1473 In Progress

kotlin-native/backend.native/build.gradle

@@ -3,6 +3,7 @@
  * that can be found in the LICENSE file.
  */
 
+import org.jetbrains.kotlin.PlatformInfo
 import org.jetbrains.kotlin.cpp.CppConsumerPlugin
 import org.jetbrains.kotlin.cpp.CppUsage
 import org.jetbrains.kotlin.cpp.DependencyHandlerExKt
@@ -78,7 +79,7 @@ kotlinNativeInterop {
         dependsOn ":kotlin-native:libllvmext:${NativePluginKt.lib("llvmext")}"
         defFile 'llvm.def'
         compilerOpts "-I$llvmDir/include", "-I${rootProject.project(':kotlin-native:llvmDebugInfoC').projectDir}/src/main/include", "-I${rootProject.project(':kotlin-native:libllvmext').projectDir}/src/main/include"
-        if (isMac()) {
+        if (PlatformInfo.isMac()) {
             // $llvmDir/lib contains libc++.1.dylib too, and it seems to be preferred by the linker
             // over the sysroot-provided one.
             // As a result, libllvmstubs.dylib gets linked with $llvmDir/lib/libc++.1.dylib.

kotlin-native/backend.native/tests/build.gradle

@@ -135,7 +135,7 @@ konanArtifacts {
 }
 
 void konanc(String[] args) {
-    String kotlincNative = isWindows() ? "kotlinc-native.bat" : "kotlinc-native"
+    String kotlincNative = PlatformInfo.isWindows() ? "kotlinc-native.bat" : "kotlinc-native"
     String allArgs = args.join(" ")
     String commandWithArguments = "$kotlinNativeDist/bin/$kotlincNative $allArgs"
 
@@ -2058,60 +2058,60 @@ tasks.register("extend_exception", KonanLocalTest) {
 }
 
 standaloneTest("check_stacktrace_format_coresymbolication") {
-    disabled = !supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=coresymbolication']
     arguments = ['coresymbolication']
     source = "runtime/exceptions/check_stacktrace_format.kt"
 }
 
 standaloneTest("stack_trace_inline") {
-    disabled = !supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xg-generate-debug-trampoline=enable', '-Xbinary=sourceInfoType=coresymbolication']
     source = "runtime/exceptions/stack_trace_inline.kt"
     arguments = ['coresymbolication']
 }
 
 standaloneTest("kt-49240-stack-trace-completeness") {
-    disabled = !supportsExceptions(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsExceptions(project) || project.globalTestArgs.contains('-opt')
     source = "runtime/exceptions/kt-49240-stack-trace-completeness.kt"
 }
 
 standaloneTest("kt-37572") {
-    disabled = !supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsCoreSymbolication(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=coresymbolication']
     arguments = ['coresymbolication']
     source = "runtime/exceptions/kt-37572.kt"
 }
 
 standaloneTest("check_stacktrace_format_libbacktrace") {
-    disabled = !supportsLibBacktrace(project)|| project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsLibBacktrace(project)|| project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=libbacktrace']
     arguments = ['libbacktrace']
     source = "runtime/exceptions/check_stacktrace_format.kt"
 }
 
 standaloneTest("stack_trace_inline_libbacktrace") {
-    disabled = !supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=libbacktrace']
     arguments = ['libbacktrace']
     source = "runtime/exceptions/stack_trace_inline.kt"
 }
 
 standaloneTest("kt-37572-libbacktrace") {
-    disabled = !supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=libbacktrace']
     arguments = ['libbacktrace']
     source = "runtime/exceptions/kt-37572.kt"
 }
 
 standaloneTest("except_constr_w_default") {
-    disabled = !supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=libbacktrace']
     source = "runtime/exceptions/except_constr_w_default.kt"
 }
 
 standaloneTest("throw_from_except_constr") {
-    disabled = !supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
+    disabled = !PlatformInfo.supportsLibBacktrace(project) || project.globalTestArgs.contains('-opt')
     flags = ['-g', '-Xbinary=sourceInfoType=libbacktrace']
     source = "runtime/exceptions/throw_from_except_constr.kt"
 }
@@ -3013,7 +3013,7 @@ KotlinNativeTestKt.createTest(project, "kt39548", KonanStandaloneTest) { task ->
     // Test infrastructure doesn't support generated source;
     // workaround by specifying dummy source:
     task.source = "does/not/exist/kt39548.dummy.kt"
-    task.enabled = isWindowsTarget(project)
+    task.enabled = PlatformInfo.isWindowsTarget(project)
 
     if (task.enabled) {
         def ktFile = project.layout.buildDirectory.file("kt39548/kt39548.kt").get().asFile
@@ -3314,9 +3314,9 @@ linkTest("inline_innerInlineFunCapturesOuter_linkTest") {
 def generateWithSpaceDefFile() {
     def buildDirectory = project.layout.buildDirectory.get().asFile
     def mapOption = "--Map \"$buildDirectory/cutom map.map\""
-    if (isAppleTarget(project)) {
+    if (PlatformInfo.isAppleTarget(project)) {
         mapOption = "-map \"$buildDirectory/cutom map.map\""
-    } else if (isWindowsTarget(project)) {
+    } else if (PlatformInfo.isWindowsTarget(project)) {
         mapOption = "\"-Wl,--Map,$buildDirectory/cutom map.map\""
     }
 
@@ -3722,7 +3722,7 @@ Task interopTestMultifile(String name, Closure<KonanInteropTest> configureClosur
 }
 
 standaloneTest("interop_objc_allocException") {
-    disabled = !isAppleTarget(project)
+    disabled = !PlatformInfo.isAppleTarget(project)
     expectedExitStatus = 0
     source = "interop/objc/allocException.kt"
     UtilsKt.dependsOnPlatformLibs(it)
@@ -3889,7 +3889,7 @@ interopTest("interop_kt51925") {
 }
 
 interopTestBase("interop_forwardDeclarationsCast", false, true) {
-    enabled = isAppleTarget(project)
+    enabled = PlatformInfo.isAppleTarget(project)
     interop = 'forwardDeclarationsCastA'
     interop2 = 'forwardDeclarationsCastB'
     lib = 'interop/forwardDeclarationsCast/lib.kt'
@@ -3929,13 +3929,13 @@ standaloneTest("isExperimentalMM") {
 }
 
 interopTest("interop_cppClass") {
-    disabled = isAppleTarget(project) // KT-58422
+    disabled = PlatformInfo.isAppleTarget(project) // KT-58422
     source = "interop/cpp/cppClass.kt"
     interop = 'cppClass'
 }
 
 interopTest("interop_cppTypes") {
-    disabled = isAppleTarget(project) // KT-58422
+    disabled = PlatformInfo.isAppleTarget(project) // KT-58422
     source = "interop/cpp/types.kt"
     interop = 'cppTypes'
 }
@@ -3949,7 +3949,7 @@ interopTest("interop_cppSkia") {
 }
 
 interopTest("interop_cppSkiaSignature") {
-    disabled = isAppleTarget(project) // KT-58422
+    disabled = PlatformInfo.isAppleTarget(project) // KT-58422
     source = "interop/cpp/skiaSignature.kt"
     interop = "cppSkiaSignature"
     useGoldenData = true
@@ -3971,7 +3971,7 @@ interopTest("interop_forwardDeclarationsTwoLibs") {
 /*
 TODO: This test isn't run automatically
 tasks.register("interop_echo_server", RunInteropKonanTest) {
-    disabled = isWasmTarget(project) || isWindowsTarget(project)
+    disabled = PlatformInfo.isWasmTarget(project) || PlatformInfo.isWindowsTarget(project)
     run = false
     source = "interop/basics/echo_server.kt"
     interop = 'sockets'
@@ -3981,7 +3981,7 @@ tasks.register("interop_echo_server", RunInteropKonanTest) {
 /*
 TODO: This test isn't run automatically
 standaloneTest("interop_opengl_teapot") {
-    enabled = isAppleTarget(project) && project.testTarget != 'ios_x64'  // No GLUT in iOS
+    enabled = PlatformInfo.isAppleTarget(project) && project.testTarget != 'ios_x64'  // No GLUT in iOS
     dependsOnPlatformLibs(it as Task)
     run = false
     source = "interop/basics/opengl_teapot.kt"
@@ -4457,7 +4457,7 @@ standaloneTest("interop_zlib") {
 }
 
 standaloneTest("interop_objc_illegal_sharing") {
-    disabled = !isAppleTarget(project)
+    disabled = !PlatformInfo.isAppleTarget(project)
     source = "interop/objc/illegal_sharing.kt"
     UtilsKt.dependsOnPlatformLibs(it)
     outputChecker = {
@@ -4752,7 +4752,7 @@ Task objcExportTest(
         Boolean isStaticFramework,
         Boolean needLazyHeaderCheck
 ) {
-    needLazyHeaderCheck = needLazyHeaderCheck && !isK2(project)  // generating lazy headers is NYI in K2
+    needLazyHeaderCheck = needLazyHeaderCheck && !PlatformInfo.isK2(project)  // generating lazy headers is NYI in K2
     final String name = "testObjCExport$suffix"
     final String frameworkName = "Kt$suffix"
     final String expectedLazyHeaderName = "expectedLazy${suffix}.h"
@@ -4854,7 +4854,7 @@ Task objcExportTest(
 
 
 
-if (isAppleTarget(project)) {
+if (PlatformInfo.isAppleTarget(project)) {
     final Task ObjCExportAllTask = tasks.create("testObjCExportAll")
     objcExportTest(
             ObjCExportAllTask,
@@ -5124,7 +5124,7 @@ tasks.register("override_konan_properties0", KonanDriverTest) {
 tasks.register("llvm_variant_dev", KonanDriverTest) {
     // We use clang from Xcode on macOS for apple targets,
     // so it is hard to reliably detect LLVM variant for these targets.
-    disabled = isAppleTarget(project)
+    disabled = PlatformInfo.isAppleTarget(project)
         || isAggressiveGC // No need to test with different GC schedulers
     flags = [
             "-Xllvm-variant=dev",
@@ -5305,7 +5305,7 @@ if (HostManager.@Companion.hostIsMac) {
 fileCheckTest("filecheck_redundant_safepoints_removal") {
     enabled = !isNoopGC && !isSTWMSGC &&
             project.globalTestArgs.contains("-opt") &&
-            !needSmallBinary(project)
+            !PlatformInfo.needSmallBinary(project)
     annotatedSource = project.file('filecheck/redundant_safepoints.kt')
     phaseToCheck = "RemoveRedundantSafepoints"
 }

kotlin-native/build.gradle

@@ -44,10 +44,8 @@ buildscript {
 
 defaultTasks 'clean', 'dist'
 
-convention.plugins.platformInfo = PlatformInfo
+if (PlatformInfo.isMac()) {
-
+    PlatformInfo.checkXcodeVersion(project)
-if (isMac()) {
-    checkXcodeVersion(project)
 }
 
 apply plugin: "kotlin.native.build-tools-conventions"
@@ -503,7 +501,7 @@ def sbomBundleRegularForPublish = tasks.register("sbomBundleRegularForPublish",
     }
 }
 
-tasks.register("bundleRegular", (isWindows()) ? Zip : Tar) {
+tasks.register("bundleRegular", (PlatformInfo.isWindows()) ? Zip : Tar) {
     dependsOn(sbomBundleRegularForPublish)
     def simpleOsName = HostManager.platformName()
     archiveBaseName.set("kotlin-native-$simpleOsName")
@@ -531,7 +529,7 @@ def sbomBundlePrebuiltForPublish = tasks.register("sbomBundlePrebuiltForPublish"
     }
 }
 
-tasks.register("bundlePrebuilt", (isWindows()) ? Zip : Tar) {
+tasks.register("bundlePrebuilt", (PlatformInfo.isWindows()) ? Zip : Tar) {
     dependsOn(sbomBundlePrebuiltForPublish)
     dependsOn("crossDistPlatformLibs")
     def simpleOsName = HostManager.platformName()
@@ -548,7 +546,7 @@ tasks.register("bundlePrebuilt", (isWindows()) ? Zip : Tar) {
 void configurePackingLicensesToBundle(AbstractArchiveTask task, boolean containsPlatformLibraries) {
     task.from(project.projectDir) {
         include 'licenses/**'
-        if (!containsPlatformLibraries || !isMac()) {
+        if (!containsPlatformLibraries || !PlatformInfo.isMac()) {
             exclude '**/xcode_license.pdf'
         }
         if (!containsPlatformLibraries) {
@@ -581,7 +579,7 @@ configure([bundleRegular, bundlePrebuilt]) {
 
     destinationDirectory.set(file('.'))
 
-    if (isWindows()) {
+    if (PlatformInfo.isWindows()) {
         zip64 true
     } else {
         archiveExtension.set('tar.gz')
@@ -589,7 +587,7 @@ configure([bundleRegular, bundlePrebuilt]) {
     }
 }
 
-tasks.register("tc-dist", (isWindows()) ? Zip : Tar) {
+tasks.register("tc-dist", (PlatformInfo.isWindows()) ? Zip : Tar) {
     dependsOn('dist')
     dependsOn('distSources')
     def simpleOsName = HostManager.platformName()
@@ -603,7 +601,7 @@ tasks.register("tc-dist", (isWindows()) ? Zip : Tar) {
 
     destinationDirectory.set(file('.'))
 
-    if (isWindows()) {
+    if (PlatformInfo.isWindows()) {
         zip64 true
     } else {
         archiveExtension.set('tar.gz')
@@ -778,7 +776,7 @@ publishing {
             } else {
                 mvn.artifact(bundleRegular) {
                     classifier = HostManager.platformName()
-                    extension = (isWindows()) ? 'zip' : 'tar.gz'
+                    extension = (PlatformInfo.isWindows()) ? 'zip' : 'tar.gz'
                 }
             }
 
@@ -811,7 +809,7 @@ publishing {
             } else {
                 mvn.artifact(bundlePrebuilt) {
                     classifier = HostManager.platformName()
-                    extension = (isWindows()) ? 'zip' : 'tar.gz'
+                    extension = (PlatformInfo.isWindows()) ? 'zip' : 'tar.gz'
                 }
             }
             KotlinBuildPublishingPluginKt.configureKotlinPomAttributes(